Author: fehr Date: Wed Aug 24 16:57:55 2011 New Revision: 65392 URL: http://svn.opensuse.org/viewcvs/yast?rev=65392&view=rev Log: use new "gpt_sync_mbr" only on non-EFI systems, on EFI systems plain "gpt" is used (bnc#710402) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Parted.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageDefines.h branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc?rev=65392&r1=65391&r2=65392&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc Wed Aug 24 16:57:55 2011 @@ -1577,7 +1577,17 @@ cmd_line << MDADMBIN " --zero-superblock --force " << quote(device()); execCheckFailed( cmd_line.str() ); cmd_line.str(""); - cmd_line << PARTEDCMD << quote(device()) << " mklabel " << label; + string lab(label); + if( lab=="gpt" ) + { + const ArchInfo& ai = getStorage()->getArchInfo(); + if( !ai.is_efiboot && (ai.arch=="i386" || ai.arch=="x86_64")) + { + y2mil( "efi:" << ai.is_efiboot << " arch:" << ai.arch ); + lab = LABEL_GPT_SYNC_MBR; + } + } + cmd_line << PARTEDCMD << quote(device()) << " mklabel " << lab; if( execCheckFailed( cmd_line.str() ) ) { ret = DISK_SET_LABEL_PARTED_FAILED; Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Parted.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Parted.cc?rev=65392&r1=65391&r2=65392&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Parted.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Parted.cc Wed Aug 24 16:57:55 2011 @@ -48,6 +48,8 @@ label = extractNthWord(2, cmd.getLine(0, true)); if (label == "unknown") label.clear(); + else if(label == LABEL_GPT_SYNC_MBR) + label = "gpt"; } else y2war("could not find partition table"); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageDefines.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageDefines.h?rev=65392&r1=65391&r2=65392&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageDefines.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageDefines.h Wed Aug 24 16:57:55 2011 @@ -30,6 +30,7 @@ #define PARTEDBIN "/usr/sbin/parted" #define PARTEDCMD PARTEDBIN " -s " // blank at end !! +#define LABEL_GPT_SYNC_MBR "gpt_sync_mbr" #define ADDPARTBIN "/usr/sbin/addpart" #define DELPARTBIN "/usr/sbin/delpart" 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=65392&r1=65391&r2=65392&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 Aug 24 16:57:55 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 24 16:55:01 CEST 2011 - fehr@suse.de + +- use new "gpt_sync_mbr" only on non-EFI systems, on EFI systems + plain "gpt" is used (bnc#710402) + +------------------------------------------------------------------- Tue Aug 23 12:13:48 CEST 2011 - fehr@suse.de - add option "-P _part" to make dmraid decativate raid (bnc#712671) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org