Author: juhliarik Date: Wed Jul 29 15:17:43 2009 New Revision: 58206 URL: http://svn.opensuse.org/viewcvs/yast?rev=58206&view=rev Log: updated proposal for using GPT Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION?rev=58206&r1=58205&r2=58206&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION Wed Jul 29 15:17:43 2009 @@ -1 +1 @@ -2.13.162 +2.13.163 Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes?rev=58206&r1=58205&r2=58206&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes Wed Jul 29 15:17:43 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 29 13:53:16 CEST 2009 - juhliarik@suse.cz + +- added fix for proposal if GPT is used (bnc#525968) +- 2.13.163 + +------------------------------------------------------------------- Tue Jul 16 12:52:56 CEST 2009 - juhliarik@suse.cz - update checking of MBR and bootloader proposal (bnc#517293) Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp?rev=58206&r1=58205&r2=58206&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp Wed Jul 29 15:17:43 2009 @@ -549,6 +549,8 @@ // variable is not used for grub anymore symbol selected_location = `mbr; // default to mbr boolean windows_mbr = false; + // bnc#525968 - Booting from GPT Failed + boolean gpt_used = false; // check whether the /boot partition // - is primary: is_logical -> false // - is on the first disk (with the MBR): boot_partition_is_on_mbr_disk -> true @@ -559,6 +561,16 @@ boolean boot_partition_is_on_mbr_disk = (boot_partition_disk == BootCommon::mbrDisk); + // bnc#525968 - Booting from GPT Failed + string dp_dev = dp["disk"]:""; + if (tm[dp_dev,"label"]:"" == "gpt") + { + y2milestone("gpt used on disk: %1", dp_dev); + gpt_used = true; + } else { + y2milestone("gpt not used on disk: %1", dp_dev); + } + map dm = tm[boot_partition_disk]:$[]; list<map> partitions_on_boot_partition_disk = dm["partitions"]:[]; boolean is_logical = false; @@ -697,7 +709,13 @@ BootCommon::globals["activate"] = "true"; SetBootloaderDevice(selected_location); } - + // bnc#525968 - Booting from GPT Failed + if (gpt_used) + { + y2milestone("Install GRUB to MBR because GPT is used"); + selected_location = `mbr; + SetBootloaderDevice(selected_location); + } return selected_location; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org