Author: juhliarik Date: Thu May 6 13:15:42 2010 New Revision: 61958 URL: http://svn.opensuse.org/viewcvs/yast?rev=61958&view=rev Log: added patch for bug#448883 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/clients/bootloader_proposal.ycp trunk/bootloader/src/modules/BootSupportCheck.ycp Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=61958&r1=61957&r2=61958&view=diff ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Thu May 6 13:15:42 2010 @@ -1 +1 @@ -2.19.12 +2.19.13 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=61958&r1=61957&r2=61958&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Thu May 6 13:15:42 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 6 13:15:18 CEST 2010 - juhliarik@suse.cz + +- added patch for (bug#448883) +- 2.19.13 + +------------------------------------------------------------------- Tue Apr 13 14:15:33 CEST 2010 - juhliarik@suse.cz - added fix for troubles with using uuid names (bnc#594482) Modified: trunk/bootloader/src/clients/bootloader_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloader_proposal.ycp?rev=61958&r1=61957&r2=61958&view=diff ============================================================================== --- trunk/bootloader/src/clients/bootloader_proposal.ycp (original) +++ trunk/bootloader/src/clients/bootloader_proposal.ycp Thu May 6 13:15:42 2010 @@ -112,6 +112,19 @@ if (Bootloader::getLoaderType () == "grub") { + integer max_end = 128; + + if (BootSupportCheck::EndOfBootOrRootPartition() > max_end * 1073741824) + { + ret = add (ret, "warning_level", `warning); + // warning text in the summary richtext + ret = add (ret, "warning", + sformat(_("The bootloader is installed on a partition that does not lie entirely below %1 GB. The system might not boot."), max_end)); + } + } + + if (Bootloader::getLoaderType () == "grub") + { import "BootGRUB"; if (BootGRUB::CheckDeviceMap()) { @@ -147,7 +160,7 @@ { y2error ("No bootloader selected"); ret = add (ret, "warning_level", `error); - // warning text in the summary rixhtext + // warning text in the summary richtext ret = add (ret, "warning", _("No boot loader is selected for installation. Your system might not be bootable.")); } @@ -156,7 +169,7 @@ { y2error ("LILO bootloader selected"); ret = add (ret, "warning_level", `error); - // warning text in the summary rixhtext + // warning text in the summary richtext ret = add (ret, "warning", _("The LILO is not supported now.")); } Modified: trunk/bootloader/src/modules/BootSupportCheck.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootSupportCheck.ycp?rev=61958&r1=61957&r2=61958&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootSupportCheck.ycp (original) +++ trunk/bootloader/src/modules/BootSupportCheck.ycp Thu May 6 13:15:42 2010 @@ -23,6 +23,7 @@ import "Bootloader"; import "Arch"; import "Storage"; +import "Region"; import "BootCommon"; import "BootStorage"; import "FileUtils"; @@ -352,4 +353,30 @@ return supported; } + +global integer EndOfBootOrRootPartition() +{ + map part = Storage::GetEntryForMountpoint("/boot"); + if (isempty(part)) + part = Storage::GetEntryForMountpoint("/"); + + string device = part["device"]:""; + y2milestone("device:%1", device); + + integer end_cyl = Region::End(part["region"]:[]); + + integer cyl_size = 82252800; + map target_map = Storage::GetTargetMap(); + foreach (string dev, map disk, target_map, { + if (find (map p, disk["partitions"]:[], { return p["device"]:"" == device; }) != nil) + cyl_size = disk["cyl_size"]:82252800; + }); + + integer ret = end_cyl * cyl_size; + + y2milestone("end_cyl:%1 cyl_size:%2 end:%3", end_cyl, cyl_size, ret); + return ret; +} + + } // EOF -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org