Author: juhliarik Date: Thu Apr 23 16:48:09 2009 New Revision: 56945 URL: http://svn.opensuse.org/viewcvs/yast?rev=56945&view=rev Log: update yast2-bootloader to using new function for detection content of MBR Removed: trunk/bootloader/scripts/examine_mbr.pl Modified: trunk/bootloader/scripts/Makefile.am trunk/bootloader/src/grub/misc.ycp trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/routines/lib_iface.ycp trunk/bootloader/src/routines/lilolike.ycp trunk/bootloader/src/routines/misc.ycp Modified: trunk/bootloader/scripts/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/scripts/Makefile.am?rev=56945&r1=56944&r2=56945&view=diff ============================================================================== --- trunk/bootloader/scripts/Makefile.am (original) +++ trunk/bootloader/scripts/Makefile.am Thu Apr 23 16:48:09 2009 @@ -2,7 +2,7 @@ # Makefile.am for y2m_inst/ycp/bootloader/milo/agents # -ybin_SCRIPTS = ppc_postinstall.sh update_gfxmenu examine_mbr.pl tp_mbr +ybin_SCRIPTS = ppc_postinstall.sh update_gfxmenu tp_mbr EXTRA_DIST = $(ybin_SCRIPTS) Modified: trunk/bootloader/src/grub/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/misc.ycp?rev=56945&r1=56944&r2=56945&view=diff ============================================================================== --- trunk/bootloader/src/grub/misc.ycp (original) +++ trunk/bootloader/src/grub/misc.ycp Thu Apr 23 16:48:09 2009 @@ -492,26 +492,6 @@ * Returns the type of device where to install: one of `boot `root `mbr `extended `mbr_md * Also sets the boot_* keys in the internal global variable globals accordingly. * - * Sets internal global variables: - * - boot_* keys in globals map set flags according to the selected bootloader device (currently one of: "boot", "root", "mbr", "mbr_md", "extended") - * - activate key in globals map to true if the partitions for stage 1 need to be "activated" (aka "set bootable") in the MBR - * - activate_changed leave untouched, except when - * - booting from a primary /boot partition on the first disk (the one with the MBR seen by the BIOS), then set to true - * (FIXME: why only then?) - * - generic_mbr key in globals map leave untouched, except when - * - booting from a primary /boot partition on the first disk, then set to true when - * - the examination of the code in the MBR - * - by examine_mbr.pl shows that it - * - DOES NOT look like a valid "stage 1" at all (not enough entropy to contain valid code) OR - * - DOES NOT look like a "generic MBR" (= DOS MBR) (OK as stage 1 to boot primary part. on 1st disk) OR - * - DOES look like a LILO or GRUB MBR (replace them with generic code - * (if stage 1 is not in MBR, see code in updateMBR()), - * they probably contain an obsolete block list for stage 2) OR - * - DOES look like some "stage 1" code (has enough entropy, but no known signature) OR - * - by KeepMBR() -> ThinkPadMBR() shows that it - * - DOES NOT look like a Thinkpad MBR (begins with specific code sequence from that one) - * otherwise set to false - * * @return string type of location proposed to bootloader */ define symbol grub_ConfigureLocation() { @@ -589,15 +569,6 @@ selected_location = `boot; BootCommon::globals["activate"] = "true"; BootCommon::activate_changed = true; - // examine_mbr.pl returns - // - != 0 (errno, e.g. 2) for a read error: "cannot read 512 - // bytes from <dev>" - // - 254 for an "invalid MBR", i.e. without enough entropy to - // contain boot code - // - 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 // check if there is raid and if it soft-raid select correct device for analyse MBR // bnc #398356 @@ -605,19 +576,16 @@ boot_partition_disk = soft_MDraid_boot_disk(partitions_on_boot_partition_disk); if (boot_partition_disk == "") boot_partition_disk = dp["disk"]:""; - // bnc #483797 cannot read 512 bytes from at /usr/lib/YaST2/bin/examine_mbr.pl + // bnc #483797 cannot read 512 bytes from... + string out = ""; 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; + out = BootCommon::examineMBR(boot_partition_disk); } else { - exit = 254; y2error("Boot partition disk not found"); } - BootCommon::globals["generic_mbr"] = ((exit == 254) && (! keep_mbr)) ? "true" : "false"; - if (exit == 0) + BootCommon::globals["generic_mbr"] = ((out != "vista") && (! keep_mbr)) ? "true" : "false"; + if (out == "vista") { y2milestone("Vista MBR..."); vista_mbr = true; Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon.ycp?rev=56945&r1=56944&r2=56945&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Thu Apr 23 16:48:09 2009 @@ -298,7 +298,7 @@ global define list<string> Summary (); global map CreateLinuxSection (string title); global string UpdateSerialConsole (string append, string console); - +global string examineMBR (string device); /* * help message and dscription definitions Modified: trunk/bootloader/src/routines/lib_iface.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lib_iface.ycp?rev=56945&r1=56944&r2=56945&view=diff ============================================================================== --- trunk/bootloader/src/routines/lib_iface.ycp (original) +++ trunk/bootloader/src/routines/lib_iface.ycp Thu Apr 23 16:48:09 2009 @@ -342,6 +342,21 @@ return ret; } +/** + * Analyse content of MBR + * + * @param string device name ("/dev/sda") + * @return string result of analyse ("GRUB stage1", "uknown",...) + */ + +global string examineMBR (string device) +{ + string ret = System::Bootloader_API::examineMBR (device); + y2milestone("Device: %1 includes in MBR: %2", device, ret); + return ret; + +} + } //end of include /* Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike.ycp?rev=56945&r1=56944&r2=56945&view=diff ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Thu Apr 23 16:48:09 2009 @@ -130,26 +130,6 @@ * Returns the type of device where to install: one of "boot", "root", "mbr", "mbr_md" * Also sets internal global variable selected_location to this. * - * Sets internal global variables: - * - selected_location to the type of bootloader device (currently one of: "boot", "root", "mbr", "mbr_md") - * - loader_device to the actual device name to install the bootloader to (e.g. "/dev/hda1") or to "mbr_md" - * - activate to true if the loader_device needs to be activated in the MBR - * - activate_changed leave untouched, except when - * - booting from a primary /boot partition on the first disk (the one with the MBR seen by the BIOS), then set to true - * (FIXME: why only then?) - * - repl_mbr leave untouched, except when - * - booting from a primary /boot partition on the first disk, then set to true when - * - the examination of the code in the MBR - * - by examine_mbr.pl shows that it - * - DOES NOT look like a valid "stage 1" at all (not enough entropy to contain valid code) OR - * - DOES NOT look like a "generic MBR" (= DOS MBR) (OK as stage 1 to boot primary part. on 1st disk) OR - * - DOES look like a LILO or GRUB MBR (replace them with generic code - * (if stage 1 is not in MBR, see code in updateMBR()), - * they probably contain an obsolete block list for stage 2) OR - * - DOES look like some "stage 1" code (has enough entropy, but no known signature) OR - * - by KeepMBR() -> ThinkPadMBR() shows that it - * - DOES NOT look like a Thinkpad MBR (begins with specific code sequence from that one) - * otherwise set to false * * @return string type of location proposed to bootloader */ @@ -211,29 +191,16 @@ loader_device = BootStorage::BootPartitionDevice; activate = true; activate_changed = true; - // examine_mbr.pl returns - // - != 0 (errno, e.g. 2) for a read error: "cannot read 512 - // bytes from <dev>" - // - 254 for an "invalid MBR", i.e. without enough entropy to - // contain boot code - // - 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 - - + // check if there is raid and if it soft-raid select correct device for analyse MBR // bnc #398356 if (size (needed_devices) > 1) disk = soft_MDraid_boot_disk(partitions); if (disk == "") disk = dp["disk"]:""; + string out = examineMBR(disk); - map out = (map)SCR::Execute (.target.bash_output, sformat ( - "/usr/lib/YaST2/bin/examine_mbr.pl %1", disk)); - y2milestone ("MBR examining script returned %1", out); - exit = out["exit"]:0; - repl_mbr = (exit == 254) && (! keep_mbr); + repl_mbr = (out != "vista") && (! keep_mbr); } else if (size (needed_devices) > 1) Modified: trunk/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/misc.ycp?rev=56945&r1=56944&r2=56945&view=diff ============================================================================== --- trunk/bootloader/src/routines/misc.ycp (original) +++ trunk/bootloader/src/routines/misc.ycp Thu Apr 23 16:48:09 2009 @@ -400,16 +400,11 @@ */ global boolean IsPartitionBootable (string device) { //FIXME this is only for grub and should go to BootGRUB - // use examine_mbr.pl to analyze PBR (partition boot record): - // examine_mbr.pl prints "* stage1" when it finds the signature + // use examineMBR to analyze PBR (partition boot record): + // examineMBR returns "* stage1" when it finds the signature // of some stage1 bootloader - // (The exit code would tell us only whether we should - // (re-)install a bootloader stage1 there in order to make the - // partition bootable, not whether a stage1 already exists.) - map result = (map)SCR::Execute (.target.bash_output, sformat ( - "/usr/lib/YaST2/bin/examine_mbr.pl %1", device)); - y2milestone ("PBR examining script returned %1", result); - return search(result["stdout"]:"", "stage1") != nil ? true : false; + string result = examineMBR(device); + return search(result, "stage1") != nil ? true : false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org