Author: aschnell Date: Mon Feb 8 11:59:44 2010 New Revision: 60722 URL: http://svn.opensuse.org/viewcvs/yast?rev=60722&view=rev Log: - allow deletion of certain partitioned RAIDs (bnc #577468) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-hd-lib.ycp branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc?rev=60722&r1=60721&r2=60722&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc Mon Feb 8 11:59:44 2010 @@ -1092,12 +1092,12 @@ if( doing ) { // displayed text during action, %1$s is replaced by a name (e.g. pdc_igeeeadj), - txt = sformat( _("Removing %1$s"), name().c_str() ); + txt = sformat( _("Removing software RAID %1$s"), name().c_str() ); } else { // displayed text before action, %1$s is replaced by a name (e.g. pdc_igeeeadj), - txt = sformat( _("Remove %1$s"), name().c_str() ); + txt = sformat( _("Remove software RAID %1$s"), name().c_str() ); } return( txt ); } Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes?rev=60722&r1=60721&r2=60722&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Mon Feb 8 11:59:44 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 08 11:25:39 CET 2010 - aschnell@suse.de + +- allow deletion of certain partitioned RAIDs (bnc #577468) + +------------------------------------------------------------------- Thu Feb 04 11:59:56 CET 2010 - aschnell@suse.de - fixed writing of mdadm.conf (bnc #565207) Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-hd-lib.ycp?rev=60722&r1=60721&r2=60722&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-hd-lib.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/include/ep-hd-lib.ycp Mon Feb 8 11:59:44 2010 @@ -89,7 +89,7 @@ } map target_map = Storage::GetTargetMap(); - map disk = Storage::GetDisk(target_map, device); + map disk = (map) target_map[device]:$[]; if (disk["type"]:`CT_UNKNOWN == `CT_DMRAID) { @@ -104,6 +104,19 @@ TreePanel::Create(); } } + else if (disk["type"]:`CT_UNKNOWN == `CT_MDPART && disk["sb_ver"]:"" != "imsm") + { + // popup text + if (Popup::YesNo(sformat(_("Really delete Partitioned RAID %1?"), device))) + { + if (deleteAllDevPartitions(disk, Stage::initial(), false)) + Storage::DeleteMdPartCo(device); + + UpdateMainStatus(); + UpdateNavigationTree(`hd); + TreePanel::Create(); + } + } else { // error popup Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp?rev=60722&r1=60721&r2=60722&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Mon Feb 8 11:59:44 2010 @@ -2817,6 +2817,16 @@ return( ret==0 ); } +global boolean DeleteMdPartCo( string name ) + { + y2milestone( "DeleteMdPartCo name:%1", name ); + integer ret = LibStorage::StorageInterface::removeMdPartCo( sint, name, true ); + if( ret<0 ) + y2error( "DeleteMdPartCo sint ret:%1", ret ); + UpdateTargetMap(); + return( ret==0 ); + } + global boolean CreateLvmVg( string name, integer pesize, boolean lvm2 ) { y2milestone( "CreateLvmVg name:%1 pesize:%2 lvm2:%3", name, pesize, lvm2 ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org