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/storage/libstorage/src/Volume.cc?rev=65554&r1=65553&r2=65554&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 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/storage/package/yast2-storage.changes?rev=65554&r1=65553&r2=65554&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 Mon Sep 5 17:10:21 2011 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Mon Sep 5 16:01:05 CEST 2011 - fehr@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/storage/storage/src/include/custom_part_dialogs.ycp?rev=65554&r1=65553&r2=65554&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 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@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org