Author: juhliarik Date: Tue Apr 14 11:48:32 2009 New Revision: 56765 URL: http://svn.opensuse.org/viewcvs/yast?rev=56765&view=rev Log: added fix for analyse MBR on soft-raids Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/grub/misc.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=56765&r1=56764&r2=56765&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Apr 14 11:48:32 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 14 11:44:43 CEST 2009 - juhliarik@suse.cz + +- added fix for troubles with analyse of MBR on soft riad + (bnc#483797) + +------------------------------------------------------------------- Fri Apr 10 15:18:33 CEST 2009 - juhliarik@suse.cz - added fix for problem with special chars in menu.lst (bnc#456362) Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev=56765&r1=56764&r2=56765&view=diff ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Tue Apr 14 11:48:32 2009 @@ -470,7 +470,7 @@ foreach(map p, partitions, { if (p["device"]:"" == boot_device) { - if ((p["type"]:nil == `sw_raid) && (p["fstype"]:"" == "MD Raid")) + if ((p["type"]:nil == `sw_raid) && (tolower(p["fstype"]:"") == "md raid")) { string device_1 = p["devices",0]:""; y2debug("device_1: %1", device_1); @@ -605,10 +605,17 @@ boot_partition_disk = soft_MDraid_boot_disk(partitions_on_boot_partition_disk); if (boot_partition_disk == "") boot_partition_disk = dp["disk"]:""; - map out = (map)SCR::Execute (.target.bash_output, sformat ( - "/usr/lib/YaST2/bin/examine_mbr.pl %1", boot_partition_disk)); - y2milestone ("MBR examining script returned %1", out); - exit = out["exit"]:0; + // bnc #483797 cannot read 512 bytes from at /usr/lib/YaST2/bin/examine_mbr.pl + if (boot_partition_disk != "") + { + map out = (map)SCR::Execute (.target.bash_output, sformat ( + "/usr/lib/YaST2/bin/examine_mbr.pl %1", boot_partition_disk)); + y2milestone ("MBR examining script returned %1", out); + exit = out["exit"]:0; + } else { + exit = 254; + y2error("Boot partition disk not found"); + } BootCommon::globals["generic_mbr"] = ((exit == 254) && (! keep_mbr)) ? "true" : "false"; if (exit == 0) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org