Author: aschnell Date: Thu Oct 9 17:42:30 2008 New Revision: 52041 URL: http://svn.opensuse.org/viewcvs/yast?rev=52041&view=rev Log: - make EFI require GPT (bnc #433166) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_check_generated.ycp trunk/storage/storage/src/include/do_proposal_flexible.ycp trunk/storage/storage/src/inst_target_selection.ycp trunk/storage/storage/src/modules/Partitions.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=52041&r1=52040&r2=52041&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Oct 9 17:42:30 2008 @@ -5,6 +5,7 @@ - don't reset mount point (bnc #432954) - fixed creating encrypted logical volumes (bnc #433462) - include file system type in tables (bnc #428142) +- make EFI require GPT (bnc #433166) - 2.17.36 ------------------------------------------------------------------- Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_check_generated.ycp?rev=52041&r1=52040&r2=52041&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Thu Oct 9 17:42:30 2008 @@ -234,7 +234,7 @@ { gpt_warning = true; } - if( Arch::ia64() && diskinfo["label"]:"gpt" != "gpt" ) + if( (Partitions::EfiBoot() || Arch::ia64()) && diskinfo["label"]:"gpt" != "gpt" ) { gpt_boot_ia64 = true; } @@ -312,7 +312,7 @@ } } - if( !Arch::ia64() && part["used_fs"]:`unknown==`vfat && part["format"]:false ) + if( !(Partitions::EfiBoot() || Arch::ia64()) && part["used_fs"]:`unknown==`vfat && part["format"]:false ) { // uses mountpoint /boot with fat if( !fat_system_boot && mountpoint=="/boot" ) @@ -600,7 +600,7 @@ } - if( (Arch::ia64 () && installation && (!boot_found || boot_fs != `vfat)) || + if( ((Partitions::EfiBoot() || Arch::ia64()) && installation && (!boot_found || boot_fs != `vfat)) || show_all_popups ) { // popup text @@ -637,7 +637,7 @@ if (ret == true) retval = `again; } - if( (Arch::ia64() && installation && boot_found && gpt_boot_ia64) || + if( ((Partitions::EfiBoot() || Arch::ia64()) && installation && boot_found && gpt_boot_ia64) || show_all_popups ) { // popup text Modified: trunk/storage/storage/src/include/do_proposal_flexible.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/do_proposal_flexible.ycp?rev=52041&r1=52040&r2=52041&view=diff ============================================================================== --- trunk/storage/storage/src/include/do_proposal_flexible.ycp (original) +++ trunk/storage/storage/src/include/do_proposal_flexible.ycp Thu Oct 9 17:42:30 2008 @@ -50,7 +50,7 @@ ``{ boolean ret = !Storage::IsPartitionable( entry ) || entry["readonly"]:false || Arch::s390(); - if( !ret && Arch::ia64() && entry["label"]:"gpt"!="gpt" ) + if( !ret && (Partitions::EfiBoot() || Arch::ia64()) && entry["label"]:"gpt"!="gpt" ) { ret = true; } @@ -2779,7 +2779,7 @@ special_boot_proposal_prepare( disk["partitions"]:[] ); boolean have_home = false; boolean have_root = false; - boolean have_boot = (!Arch::ia64()||mode!=`free) && size(p)>0; + boolean have_boot = (!(Partitions::EfiBoot() || Arch::ia64()) || mode!=`free) && size(p)>0; if( have_boot ) disk["partitions"] = p; map r = can_swap_reuse( s, disk["partitions"]:[], target ); Modified: trunk/storage/storage/src/inst_target_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_target_selection.ycp?rev=52041&r1=52040&r2=52041&view=diff ============================================================================== --- trunk/storage/storage/src/inst_target_selection.ycp (original) +++ trunk/storage/storage/src/inst_target_selection.ycp Thu Oct 9 17:42:30 2008 @@ -242,7 +242,7 @@ Popup::Error( Partitions::RdonlyText( (string)option, true )); sym = `again; } - else if( Arch::ia64() && targetMap[(string)option,"label"]:"gpt"!="gpt" ) + else if( (Partitions::EfiBoot() || Arch::ia64()) && targetMap[(string)option,"label"]:"gpt"!="gpt" ) { Popup::Error( ia64_gpt_text() ); sym = `again; Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Partitions.ycp?rev=52041&r1=52040&r2=52041&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Thu Oct 9 17:42:30 2008 @@ -283,7 +283,7 @@ if( fsid_boot == 0 ) { fsid_boot = fsid_native; - if (Arch::ia64()) + if (EfiBoot() || Arch::ia64()) { fsid_boot = fsid_gpt_boot; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org