Author: fehr Date: Wed Jul 6 19:08:29 2011 New Revision: 64758 URL: http://svn.opensuse.org/viewcvs/yast?rev=64758&view=rev Log: fix bug when setting mount point and changing fstype from non-btrfs to btrfs and vice versa Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.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/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc?rev=64758&r1=64757&r2=64758&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 Jul 6 19:08:29 2011 @@ -1828,7 +1828,7 @@ { ret = STORAGE_CHANGE_READONLY; } - else if( findVolume( partition, cont, vol ) ) + else if( findVolume( partition, cont, vol, true ) ) { if( cont->type()==DISK ) { @@ -1984,7 +1984,7 @@ { ret = STORAGE_CHANGE_READONLY; } - else if( findVolume( partition, cont, vol ) ) + else if( findVolume( partition, cont, vol, true ) ) { if( cont->type()==DISK ) { @@ -2378,8 +2378,8 @@ if( findVolume( device, vol ) && vol->cType()!=BTRFSC ) { vol->updateFsData(); - vol->changeMount( mp ); vol->clearUsedBy(); + vol->changeMount( mp ); ret = vol->setFormat( format, fs ); } else 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=64758&r1=64757&r2=64758&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 Jul 6 19:08:29 2011 @@ -3,6 +3,8 @@ - changed ext4 to unsupported - removed all user visible references to ext4 from texts +- 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 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=64758&r1=64757&r2=64758&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 Wed Jul 6 19:08:29 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