September 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r65560 - /tags/branch-Code-11-SP2-2_17_113/storage/
by fehr＠svn2.opensuse.org 05 Sep '11

05 Sep '11

Author: fehr Date: Mon Sep 5 17:16:43 2011 New Revision: 65560 URL: http://svn.opensuse.org/viewcvs/yast?rev=65560&view=rev Log: Created tag branch-Code-11-SP2-2_17_113 for storage Added: tags/branch-Code-11-SP2-2_17_113/storage/ (props changed) - copied from r65559, branches/SuSE-Code-11-SP2-Branch/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65559 - /tags/branch-Code-11-SP2-2_17_113/
by fehr＠svn2.opensuse.org 05 Sep '11

05 Sep '11

Author: fehr Date: Mon Sep 5 17:16:41 2011 New Revision: 65559 URL: http://svn.opensuse.org/viewcvs/yast?rev=65559&view=rev Log: Created tag branch-Code-11-SP2-2_17_113 Added: tags/branch-Code-11-SP2-2_17_113/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65558 - in /trunk/s390/src/onpanic: ./ Makefile.in
by aschnell＠svn2.opensuse.org 05 Sep '11

05 Sep '11

Author: aschnell Date: Mon Sep 5 17:16:01 2011 New Revision: 65558 URL: http://svn.opensuse.org/viewcvs/yast?rev=65558&view=rev Log: - removed generated file, updated ignores Removed: trunk/s390/src/onpanic/Makefile.in Modified: trunk/s390/src/onpanic/ (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65557 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 05 Sep '11

05 Sep '11

Author: fehr Date: Mon Sep 5 17:15:07 2011 New Revision: 65557 URL: http://svn.opensuse.org/viewcvs/yast?rev=65557&view=rev Log: fix handling of label on btrfs Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Sep 5 17:15:07 2011 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Mon Sep 5 16:01:05 CEST 2011 - fehr(a)suse.de +- fix detection and handling of label on btrfs - use "btrfs filesystem label" to handle label on btrfs - fix wrong size check for tmpfs - fixed potential confusing text about disk init (bnc#715801) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Sep 5 17:15:07 2011 @@ -1834,7 +1834,7 @@ filter( map p, tg["/dev/btrfs","partitions"]:[], ``(size(p["devices"]:[])>1)); y2milestone( "HandleBtrfsSimpleVolumes simple %1", simple ); - list<string> keys = [ "subvol", "uuid", "format", "inactive", "mount", "mountby", "used_fs" ]; + list<string> keys = [ "subvol", "uuid", "label", "format", "inactive", "mount", "mountby", "used_fs" ]; foreach( map p, simple, { map mp = GetPartition( tg, p["device"]:"" ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65556 - in /branches/SuSE-Code-11-SP2-Branch/storage: VERSION libstorage/src/Btrfs.cc package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 05 Sep '11

05 Sep '11

Author: fehr Date: Mon Sep 5 17:14:12 2011 New Revision: 65556 URL: http://svn.opensuse.org/viewcvs/yast?rev=65556&view=rev Log: - version 2.17.113 - fix detection and handling of label on btrfs Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/VERSION Mon Sep 5 17:14:12 2011 @@ -1 +1 @@ -2.17.112 +2.17.113 Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Btrfs.cc Mon Sep 5 17:14:12 2011 @@ -46,7 +46,8 @@ y2mil("constructed btrfs vol size:" << sz << " devs:" << devs ); y2mil("constructed btrfs vol from:" << v ); setFs(BTRFS); - changeMountBy(MOUNTBY_UUID); + if( getMountBy()!=MOUNTBY_LABEL ) + changeMountBy(MOUNTBY_UUID); setSize( sz ); } Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Mon Sep 5 17:14:12 2011 @@ -1,6 +1,8 @@ ------------------------------------------------------------------- Mon Sep 5 16:01:05 CEST 2011 - fehr(a)suse.de +- version 2.17.113 +- fix detection and handling of label on btrfs - use "btrfs filesystem label" to handle label on btrfs - fix wrong size check for tmpfs Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Mon Sep 5 17:14:12 2011 @@ -1834,7 +1834,7 @@ filter( map p, tg["/dev/btrfs","partitions"]:[], ``(size(p["devices"]:[])>1)); y2milestone( "HandleBtrfsSimpleVolumes simple %1", simple ); - list<string> keys = [ "subvol", "uuid", "format", "inactive", "mount", "mountby", "used_fs" ]; + list<string> keys = [ "subvol", "uuid", "label", "format", "inactive", "mount", "mountby", "used_fs" ]; foreach( map p, simple, { map mp = GetPartition( tg, p["device"]:"" ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65555 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp
by fehr＠svn2.opensuse.org 05 Sep '11

05 Sep '11

Author: fehr Date: Mon Sep 5 17:12:21 2011 New Revision: 65555 URL: http://svn.opensuse.org/viewcvs/yast?rev=65555&view=rev Log: use "btrfs filesystem label" to handle label on btrfs Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Sep 5 17:12:21 2011 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Mon Sep 5 16:01:05 CEST 2011 - fehr(a)suse.de +- use "btrfs filesystem label" to handle label on btrfs - fix wrong size check for tmpfs - fixed potential confusing text about disk init (bnc#715801) Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Mon Sep 5 17:12:21 2011 @@ -582,7 +582,6 @@ map enab = $[]; boolean tmp = !contains( no_mountby_type, new["type"]:`primary ); enab[`label] = tmp && FileSystems::MountLabel( new["used_fs"]:`unknown ) && - (new["used_fs"]:`unknown!=`btrfs||new["format"]:false) && new["enc_type"]:`none==`none; enab[`uuid] = tmp && (new["format"]:false || size(new["uuid"]:"")>0) && FileSystems::MountUuid( new["used_fs"]:`unknown ) && -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65554 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/Volume.cc package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp
by fehr＠svn2.opensuse.org 05 Sep '11

05 Sep '11

Author: fehr Date: Mon Sep 5 17:10:21 2011 New Revision: 65554 URL: http://svn.opensuse.org/viewcvs/yast?rev=65554&view=rev Log: use "btrfs filesystem label" to handle label on btrfs Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/custom_part_dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc Mon Sep 5 17:10:21 2011 @@ -832,8 +832,6 @@ SystemCmd c; string defvol = getStorage()->getDefaultSubvolName(); string cmd = "/sbin/mkfs.btrfs " + quote(mountDevice()); - if( !label.empty() ) - cmd += " -L" + label; c.execute( cmd ); if( c.retcode()!=0 ) { @@ -1112,7 +1110,7 @@ uuid = "testmode-0123-4567-6666-98765432"+decString(fcount++); } } - if( ret==0 && !label.empty() && fs!=BTRFS ) + if( ret==0 && !label.empty() ) { ret = doSetLabel(); } @@ -2428,6 +2426,10 @@ cmd += " -U " + quote(uuid); cmd += " " + quote(mountDevice()); break; + case BTRFS: + cmd = BTRFSBIN " filesystem label " + quote(mountDevice()); + cmd += " " + quote(label); + break; default: ret = VOLUME_MKLABEL_FS_UNABLE; break; Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Mon Sep 5 17:10:21 2011 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Mon Sep 5 16:01:05 CEST 2011 - fehr(a)suse.de +- use "btrfs filesystem label" to handle label on btrfs - fix wrong size check for tmpfs ------------------------------------------------------------------- Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/custom_part_dialogs.ycp Mon Sep 5 17:10:21 2011 @@ -582,7 +582,6 @@ map enab = $[]; boolean tmp = !contains( no_mountby_type, new["type"]:`primary ); enab[`label] = tmp && FileSystems::MountLabel( new["used_fs"]:`unknown ) && - (new["used_fs"]:`unknown!=`btrfs||new["format"]:false) && new["enc_type"]:`none==`none; enab[`uuid] = tmp && (new["format"]:false || size(new["uuid"]:"")>0) && FileSystems::MountUuid( new["used_fs"]:`unknown ) && -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65553 - /tags/branch-Code-11-SP2-2_17_10/repair/
by jreidinger＠svn2.opensuse.org 05 Sep '11

05 Sep '11

Author: jreidinger Date: Mon Sep 5 16:54:36 2011 New Revision: 65553 URL: http://svn.opensuse.org/viewcvs/yast?rev=65553&view=rev Log: Created tag branch-Code-11-SP2-2_17_10 for repair Added: tags/branch-Code-11-SP2-2_17_10/repair/ (props changed) - copied from r65552, branches/SuSE-Code-11-SP2-Branch/repair/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65552 - in /branches/SuSE-Code-11-SP2-Branch/repair: VERSION package/yast2-repair.changes src/OSRDirect.ycp
by jreidinger＠svn2.opensuse.org 05 Sep '11

05 Sep '11

Author: jreidinger Date: Mon Sep 5 16:54:20 2011 New Revision: 65552 URL: http://svn.opensuse.org/viewcvs/yast?rev=65552&view=rev Log: initialize properly storage otherwise repair crash (bnc#700323),2.17.10 Modified: branches/SuSE-Code-11-SP2-Branch/repair/VERSION branches/SuSE-Code-11-SP2-Branch/repair/package/yast2-repair.changes branches/SuSE-Code-11-SP2-Branch/repair/src/OSRDirect.ycp Modified: branches/SuSE-Code-11-SP2-Branch/repair/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/repai… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/repair/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/repair/VERSION Mon Sep 5 16:54:20 2011 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: branches/SuSE-Code-11-SP2-Branch/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/repai… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/repair/package/yast2-repair.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/repair/package/yast2-repair.changes Mon Sep 5 16:54:20 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 5 14:36:13 UTC 2011 - jreidinger(a)suse.com + +- initialize properly storage otherwise repair crash (bnc#700323) +- 2.17.10 + +------------------------------------------------------------------- Thu Jul 14 15:14:17 UTC 2011 - jreidinger(a)novell.com - temporary disable test for storage detection Modified: branches/SuSE-Code-11-SP2-Branch/repair/src/OSRDirect.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/repai… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/repair/src/OSRDirect.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/repair/src/OSRDirect.ycp Mon Sep 5 16:54:20 2011 @@ -152,6 +152,8 @@ // wait popup `Label(_("Reading system settings..."))); + //initialize storage to get lock http://lists.opensuse.org/yast-devel/2008-08/msg00004.html and https://bugzilla.novell.com/show_bug.cgi?id=700323#c5 + Storage::InitLibstorage(true); OSRFstab::Reset(); OSRFsck::LoadAllFsModules(); Storage::ReReadTargetMap(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r65551 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp storage/src/modules/FileSystems.ycp
by fehr＠svn2.opensuse.org 05 Sep '11

05 Sep '11

Author: fehr Date: Mon Sep 5 16:36:49 2011 New Revision: 65551 URL: http://svn.opensuse.org/viewcvs/yast?rev=65551&view=rev Log: fix wrong size check for tmpfs Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/modules/FileSystems.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Sep 5 16:36:49 2011 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- -Mon Sep 5 11:56:32 CEST 2011 - fehr(a)suse.de +Mon Sep 5 16:01:05 CEST 2011 - fehr(a)suse.de +- fix wrong size check for tmpfs - fixed potential confusing text about disk init (bnc#715801) ------------------------------------------------------------------- Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Mon Sep 5 16:36:49 2011 @@ -202,39 +202,70 @@ string valid_chars = entry[`valid_chars]:""; integer str_length = entry[`str_length]:0; - if( between != [] && (size(query)>0 || !entry[`empty_allowed]:false)) + if( entry[`query_key]:""=="tmpfs_size" ) { - y2milestone( "DoInputChecks entry:%1 query:\"%2\"", entry, query ); - if( between[0]:0 > tointeger(query) || - ( (between[1]:0 != -1) && (between[1]:0 < tointeger(query) ) ) ) + integer sz=0; + integer pospct = search( query, "%" ); + integer posdot = search( query, "." ); + if( posdot == nil ) + posdot = search( query, "," ); + if( posdot!=nil ) { - Popup::Error(entry[`error_text]:""); + Popup::Error(_("No floating point number!")); ret = `error; } - } - if( below != 0 && (size(query)>0 || !entry[`empty_allowed]:false)) - { - y2milestone( "DoInputChecks entry:%1 query:\"%2\"", entry, query ); - if( below < tofloat(query) ) + else { - Popup::Error(entry[`error_text]:""); - ret = `error; + if( pospct!=nil && (between[0]:0 > tointeger(query) || + ( (between[1]:0 != -1) && (between[1]:0 < tointeger(query) )) ) ) + { + Popup::Error(entry[`error_text_percent]:""); + ret = `error; + } + else if( pospct==nil && + (!Storage::HumanStringToByte( query, sz ) || + sz<entry[`min_size]:1 )) + { + Popup::Error(entry[`error_text]:""); + ret = `error; + } } } - if( valid_chars != "" && size(query)>0 && ret != `error ) + else { - if( nil != findfirstnotof( query, valid_chars )) + if( between != [] && (size(query)>0 || !entry[`empty_allowed]:false)) + { + y2milestone( "DoInputChecks entry:%1 query:\"%2\"", entry, query ); + if( between[0]:0 > tointeger(query) || + ( (between[1]:0 != -1) && (between[1]:0 < tointeger(query) ) ) ) + { + Popup::Error(entry[`error_text]:""); + ret = `error; + } + } + if( below != 0 && (size(query)>0 || !entry[`empty_allowed]:false)) + { + y2milestone( "DoInputChecks entry:%1 query:\"%2\"", entry, query ); + if( below < tofloat(query) ) + { + Popup::Error(entry[`error_text]:""); + ret = `error; + } + } + if( valid_chars != "" && size(query)>0 && ret != `error ) + { + if( nil != findfirstnotof( query, valid_chars )) + { + Popup::Error(entry[`error_text]:""); + ret = `error; + } + } + if( str_length != 0 && size(query) > str_length && ret != `error ) { Popup::Error(entry[`error_text]:""); ret = `error; } } - - if( str_length != 0 && size(query) > str_length && ret != `error ) - { - Popup::Error(entry[`error_text]:""); - ret = `error; - } y2milestone( "DoInputChecks value %1 ret %2", query, ret ); return( ret ); } Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Sep 5 16:36:49 2011 @@ -332,15 +332,17 @@ }; list< map<symbol, any> > tmpfs_fst_options = [ - $[ `widget : `TextEntry( `id("size"), `opt(`hstretch), + $[ `widget : `TextEntry( `id("tmpfs_size"), `opt(`hstretch), // label text _("Tmpfs &Size"), "" ), - `query_key : "size", - `between : [ 1, 200 ], + `query_key : "tmpfs_size", + `between : [ 1, 200 ], `empty_allowed : true, + `min_size : 100*1024, `valid_chars : "0123456789kKmMgG%", // popup text - `error_text : _("Value must be larger than 0. Try again."), + `error_text : _("Value must be above 100k or between 1% and 200%. Try again."), + `error_text_percent : _("Value must be 1% and 200%. Try again."), `type : `text, `str_opt : "size=%1", `str_scan : "size=$.*$", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0