Author: fehr Date: Wed Jul 6 19:08:06 2011 New Revision: 64757 URL: http://svn.opensuse.org/viewcvs/yast?rev=64757&view=rev Log: fix bug when setting mount point and changing fstype from non-btrfs to btrfs and vice versa 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.changes?rev=64757&r1=64756&r2=64757&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Jul 6 19:08:06 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 6 19:04:10 CEST 2011 - fehr@suse.de + +- fix bug when setting mount point and changing fstype from + non-btrfs to btrfs and vice versa + +------------------------------------------------------------------- Fri Jul 01 09:54:28 CEST 2011 - aschnell@suse.de - fixed some typos (bnc #703246) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=64757&r1=64756&r2=64757&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Jul 6 19:08:06 2011 @@ -1954,6 +1954,7 @@ { found = true; p = pp; + mdev = pp; } } return( p ); @@ -1964,9 +1965,13 @@ } else y2error( "UpdateTargetMapDev key %1 not found in target", disk["device"]:"" ); + y2milestone( "UpdateTargetMapDev mdev %1", mdev ); if( mdev["used_fs"]:`unknown == `btrfs ) { - tg["/dev/btrfs"] = getContainerInfo(tg["/dev/btrfs"]:$[]); + map bt = tg["/dev/btrfs"]:$[]; + if( size(bt)==0 ) + bt["type"] = `CT_BTRFS; + tg["/dev/btrfs"] = getContainerInfo(bt); tg = HandleBtrfsSimpleVolumes( tg ); } StorageMap[targets_key] = tg; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org