Author: fehr Date: Wed Aug 10 15:01:36 2011 New Revision: 65297 URL: http://svn.opensuse.org/viewcvs/yast?rev=65297&view=rev Log: allow label on btrfs when format is true Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc 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/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc?rev=65297&r1=65296&r2=65297&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc Wed Aug 10 15:01:36 2011 @@ -5535,8 +5535,8 @@ static FsCapabilitiesX ext4Caps (true, true, true, false, true, true, true, 16, 32*1024); - static FsCapabilitiesX btrfsCaps (false, false, false, false, true, false, - false, 0, 256*1024); + static FsCapabilitiesX btrfsCaps (false, false, false, false, true, true, + false, 16, 256*1024); static FsCapabilitiesX xfsCaps (true, true, false, false, true, true, false, 12, 40*1024); 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/storage/libstorage/src/Volume.cc?rev=65297&r1=65296&r2=65297&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc Wed Aug 10 15:01:36 2011 @@ -832,6 +832,8 @@ 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 ) { @@ -1110,7 +1112,7 @@ uuid = "testmode-0123-4567-6666-98765432"+decString(fcount++); } } - if( ret==0 && !label.empty() ) + if( ret==0 && !label.empty() && fs!=BTRFS ) { ret = doSetLabel(); } 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/storage/package/yast2-storage.changes?rev=65297&r1=65296&r2=65297&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Wed Aug 10 15:01:36 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Aug 10 14:59:41 CEST 2011 - fehr@suse.de + +- allow label on btrfs when format is true + +------------------------------------------------------------------- Tue Aug 9 16:29:08 CEST 2011 - fehr@suse.de - fix bugs in subvolume handling during install 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/storage/storage/src/include/custom_part_dialogs.ycp?rev=65297&r1=65296&r2=65297&view=diff ============================================================================== --- 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 Wed Aug 10 15:01:36 2011 @@ -551,9 +551,11 @@ 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 ); + FileSystems::MountUuid( new["used_fs"]:`unknown ) && + new["enc_type"]:`none==`none; tmp = contains(mountby_id_path_type, new["type"]:`none); enab[`id] = tmp && size(new["udev_id"]:[])>0; enab[`path] = tmp && size(new["udev_path"]:"")>0; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org