[yast-commit] r64117 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/FileSystems.ycp storage/src/modules/Storage.ycp

Author: fehr Date: Thu May 26 16:15:30 2011 New Revision: 64117 URL: http://svn.opensuse.org/viewcvs/yast?rev=64117&view=rev Log: - remove unsupported state of btrfs - btrfs related bugfixes Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/FileSystems.ycp 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.cha... ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu May 26 16:15:30 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 26 16:07:46 CEST 2011 - fehr@suse.de + +- remove unsupported state of btrfs +- btrfs related bugfixes + +------------------------------------------------------------------- Tue Apr 26 17:09:33 CEST 2011 - fehr@suse.de - allow autoyast to set disklabel to e.g. gpt (bnc#631176) Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/FileS... ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Thu May 26 16:15:30 2011 @@ -182,7 +182,7 @@ `lvm : true ]; - list<symbol> unsupportFs = [ `jfs, `btrfs ]; + list<symbol> unsupportFs = [ `jfs ]; global define list<map<symbol, any> > GetGeneralFstabOptions() Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stora... ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu May 26 16:15:30 2011 @@ -1803,11 +1803,16 @@ tg["/dev/btrfs","partitions"] = filter( map p, tg["/dev/btrfs","partitions"]:[], ``(size(p["devices"]:[])>1)); - y2milestone( "simple %1", simple ); + y2milestone( "HandleBtrfsSimpleVolumes simple %1", simple ); + list<string> keys = [ "subvol", "uuid", "format", "fstype", "inactive", "mount", "mountby", "used_fs" ]; foreach( map p, simple, { - tg = SetPartitionData( tg, p["device"]:"", "subvol", p["subvol"]:[] ); - tg = SetPartitionData( tg, p["device"]:"", "uuid", p["uuid"]:"" ); + y2milestone( "HandleBtrfsSimpleVolumes before %1", GetPartition( tg, p["device"]:"" ); + foreach( string k, keys, + { + tg = SetPartitionData( tg, p["device"]:"", k, p[k]:(any)"" ); + }); + y2milestone( "HandleBtrfsSimpleVolumes after %1", GetPartition( tg, p["device"]:"" ); }); } return( tg ); @@ -1876,7 +1881,7 @@ conts = getContainers(); map c = $[]; c = find( map c, conts, ``(c["device"]:""==dev) ); - map tg = StorageMap[targets_key]:$[]; + map<string,map> tg = StorageMap[targets_key]:$[]; //SCR::Write(.target.ycp, "/tmp/upd_disk_bef_"+sformat("%1",count), StorageMap[targets_key]:$[] ); if( c==nil ) { @@ -1890,6 +1895,8 @@ else { tg[dev] = getContainerInfo(c); + if( dev=="/dev/btrfs" ) + tg = HandleBtrfsSimpleVolumes( tg ); } StorageMap[targets_key] = tg; //SCR::Write(.target.ycp, "/tmp/upd_disk_aft_"+sformat("%1",count), StorageMap[targets_key]:$[] ); @@ -1902,6 +1909,8 @@ map<string,map> tg = StorageMap[targets_key]:$[]; //SCR::Write(.target.ycp, "/tmp/upd_dev_bef_"+sformat("%1",count), tg ); string cdev=""; + map mdev = GetPartition( tg, dev ); + y2milestone( "UpdateTargetMapDev mdev %1", mdev ); foreach( string key, map d, tg, ``{ if( size(cdev)==0 && @@ -1940,6 +1949,11 @@ } else y2error( "UpdateTargetMapDev key %1 not found in target", disk["device"]:"" ); + if( mdev["used_fs"]:`unknown == `btrfs ) + { + tg["/dev/btrfs"] = getContainerInfo(tg["/dev/btrfs"]:$[]); + tg = HandleBtrfsSimpleVolumes( tg ); + } StorageMap[targets_key] = tg; //SCR::Write(.target.ycp, "/tmp/upd_dev_aft_"+sformat("%1",count), StorageMap[targets_key]:$[] ); //count = count+1; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
fehr@svn2.opensuse.org