Author: fehr Date: Mon Oct 8 10:52:05 2007 New Revision: 41277 URL: http://svn.opensuse.org/viewcvs/yast?rev=41277&view=rev Log: fix having obsolete LVM entries displayed after removal of disk label (#290779) Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes?rev=41277&r1=41276&r2=41277&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Mon Oct 8 10:52:05 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 1 17:35:09 CEST 2007 - fehr@suse.de + +- fix having obsolete LVM entries displayed after removal of disk + label (#290779) + +------------------------------------------------------------------- Mon May 14 16:19:05 CEST 2007 - fehr@suse.de - fix wrong crypttab entry for encrypted swap with password (#273572) Modified: branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp?rev=41277&r1=41276&r2=41277&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp Mon Oct 8 10:52:05 2007 @@ -2922,8 +2922,7 @@ label ); if( ret<0 ) y2error( "DeletePartitionTable sint ret:%1", ret ); - UpdateTargetMapDisk( disk ); - UpdateTargetMapDisk( "/dev/evms" ); + UpdateTargetMap(); return( ret==0 ); } @@ -3255,10 +3254,15 @@ if( target[k,"delete"]:false && haskey( tg, k ) ) { if( target[k,"type"]:`CT_UNKNOWN==`CT_LVM ) + { DeleteLvmVg( target[k,"name"]:"" ); + target[k,"delete"] = false; + } else if( target[k,"type"]:`CT_UNKNOWN==`CT_EVMS ) + { DeleteEvmsCo( target[k,"name"]:"" ); - target[k,"delete"] = false; + target[k,"delete"] = false; + } } }); keys = maplist( string k, any e, target, ``(k)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org