Author: fehr Date: Tue Apr 26 17:10:43 2011 New Revision: 63866 URL: http://svn.opensuse.org/viewcvs/yast?rev=63866&view=rev Log: allow autoyast to set disklabel to e.g. gpt (bnc#631176) 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=63866&r1=63865&r2=63866&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Apr 26 17:10:43 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 26 17:09:33 CEST 2011 - fehr@suse.de + +- allow autoyast to set disklabel to e.g. gpt (bnc#631176) + +------------------------------------------------------------------- Thu Apr 21 11:16:43 CEST 2011 - fehr@suse.de - add support for tmpfs (fate#303810) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=63866&r1=63865&r2=63866&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Apr 26 17:10:43 2011 @@ -3105,10 +3105,11 @@ * @param string the disk to deleted the partition table from * @return boolean */ -global boolean DeletePartitionTable(string disk) +global boolean DeletePartitionTable(string disk, string label) { - y2milestone("DeletePartitionTable disk:%1", disk); - string label = DefaultDiskLabel(disk); + y2milestone("DeletePartitionTable disk:%1 label:%2", disk, label); + if( size(label)==0 ) + label = DefaultDiskLabel(disk); integer ret = LibStorage::StorageInterface::destroyPartitionTable(sint, disk, label); if( ret<0 ) y2error( "DeletePartitionTable sint ret:%1", ret ); @@ -4035,14 +4036,14 @@ if( target[k,"type"]:`CT_UNKNOWN==`CT_LVM ) DeleteLvmVg( target[k,"name"]:"" ); else if( target[k,"type"]:`CT_UNKNOWN==`CT_DISK ) - DeletePartitionTable( k ); + DeletePartitionTable( k, target[k,"disklabel"]:"" ); else if( target[k,"type"]:`CT_UNKNOWN==`CT_DMRAID ) DeleteDmraid( k ); } if( target[k,"del_ptable"]:false && IsPartType( target[k,"type"]:`CT_UNKNOWN ) ) { - DeletePartitionTable( k ); + DeletePartitionTable( k, target[k,"disklabel"]:"" ); } }); 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