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/storage/VERSION?rev=65556&r1=65555&r2=65556&view=diff ============================================================================== --- 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/storage/libstorage/src/Btrfs.cc?rev=65556&r1=65555&r2=65556&view=diff ============================================================================== --- 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/storage/package/yast2-storage.changes?rev=65556&r1=65555&r2=65556&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:14:12 2011 @@ -1,6 +1,8 @@ ------------------------------------------------------------------- Mon Sep 5 16:01:05 CEST 2011 - fehr@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/storage/storage/src/modules/Storage.ycp?rev=65556&r1=65555&r2=65556&view=diff ============================================================================== --- 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@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org