Author: juhliarik Date: Mon Oct 27 13:22:51 2008 New Revision: 52575 URL: http://svn.opensuse.org/viewcvs/yast?rev=52575&view=rev Log: - added fix for handling generic boot code and checking XFS on bood device Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/scripts/examine_mbr.pl trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/modules/BootSupportCheck.ycp trunk/bootloader/src/routines/lilolike.ycp Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=52575&r1=52574&r2=52575&view=diff ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Mon Oct 27 13:22:51 2008 @@ -1 +1 @@ -2.17.33 +2.17.34 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=52575&r1=52574&r2=52575&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Mon Oct 27 13:22:51 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 27 12:45:44 CET 2008 - juhliarik@suse.cz + +- updated checking of boot device s not on XFS (bnc #438757) +- added fix for problem with generic boot code (bnc #438752) +- 2.17.34 + +------------------------------------------------------------------- Mon Oct 27 10:39:37 CET 2008 - jsrain@suse.cz - updated method of ThinkPad MBR detection Modified: trunk/bootloader/scripts/examine_mbr.pl URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/scripts/examine_mbr.pl?rev=52575&r1=52574&r2=52575&view=diff ============================================================================== --- trunk/bootloader/scripts/examine_mbr.pl (original) +++ trunk/bootloader/scripts/examine_mbr.pl Mon Oct 27 13:22:51 2008 @@ -45,7 +45,7 @@ if (substr($MBR, 320, 126) =~ m,invalid partition table.*no operating system,i) { print "Generic MBR\n"; - exit 0; + exit 254; } if (substr($MBR, 346, 100) =~ m,GRUB .Geom.Hard Disk.Read. Error,) { Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev=52575&r1=52574&r2=52575&view=diff ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Mon Oct 27 13:22:51 2008 @@ -613,7 +613,7 @@ // bytes from <dev>" // - 254 for an "invalid MBR", i.e. without enough entropy to // contain boot code - // - 0 for a "Generic MBR" (DOS MBR) + // - 254 for a "Generic MBR" (DOS MBR) - bnc #438752 // - 254 for a GRUB or lilo "stage 1" // - 254 for an unknown MBR // - 0 for Vista MBR Modified: trunk/bootloader/src/modules/BootSupportCheck.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootSupportCheck.ycp?rev=52575&r1=52574&r2=52575&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootSupportCheck.ycp (original) +++ trunk/bootloader/src/modules/BootSupportCheck.ycp Mon Oct 27 13:22:51 2008 @@ -177,39 +177,26 @@ } else { found_boot = true; y2milestone("The boot device: %1 is not on raid0", boot_device); - break; + //break; } + // check if /boot directory is on supported filesystem + if (p["used_fs"]:nil == `xfs) { + AddNewProblem (_("The /boot directory is on an XFS filesystem")); + y2error ("The /boot directory is on an XFS filesystem"); + result = false; + break; + } else { + found_boot = true; + y2milestone ("/boot filesystem is OK"); + break; + } + } }); if ((!result) || (found_boot)) break; }); - } - // check if /boot directory is on supported filesystem - boolean boot_dir_result = true; - found_boot = false; - foreach (string k, map v, devices, { - foreach (map p, (list<map>)(v["partitions"]:[]), { - if (p["device"]:"" == BootCommon::BootPartitionDevice) - { - if (p["used_fs"]:nil == `xfs) { - AddNewProblem (_("The /boot directory is on an XFS filesystem")); - y2error ("The /boot directory is on an XFS filesystem"); - boot_dir_result = false; - break; - } - else - { - found_boot = true; - y2milestone ("/boot filesystem is OK"); - break; - } - } - }); - if ((!boot_dir_result) || (found_boot)) - break; - }); - result = result && boot_dir_result; + } return result; } Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike.ycp?rev=52575&r1=52574&r2=52575&view=diff ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Mon Oct 27 13:22:51 2008 @@ -254,7 +254,7 @@ // bytes from <dev>" // - 254 for an "invalid MBR", i.e. without enough entropy to // contain boot code - // - 0 for a "Generic MBR" (DOS MBR) + // - 254 for a "Generic MBR" (DOS MBR) - bnc #438752 // - 254 for a GRUB or lilo "stage 1" // - 254 for an unknown MBR // - 0 for a Vista MBR -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org