Author: odabrunz Date: Thu Sep 13 05:28:03 2007 New Revision: 40883 URL: http://svn.opensuse.org/viewcvs/yast?rev=40883&view=rev Log: - specify blockoffset as string, rather than number - added a FIXME comment - fixed conversion of obsolete filenames in kernel and initrd keys - fixed conversion of device names in root and chainloader keys (#309837) Modified: trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/routines/lilolike.ycp Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.y... ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Thu Sep 13 05:28:03 2007 @@ -346,7 +346,7 @@ // mountable bootable => chainloader (label: to be decided) new_sect["noverifyroot"] = "true"; new_sect["chainloader"] = dev; - new_sect["blockoffset"] = 1; + new_sect["blockoffset"] = "1"; new_sect["type"] = "other"; } else Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike.... ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Thu Sep 13 05:28:03 2007 @@ -712,7 +712,7 @@ // bootable => chainloader s["noverifyroot"] = "true"; s["chainloader"] = dev; - s["blockoffset"] = 1; + s["blockoffset"] = "1"; s["type"] = "other"; y2milestone ("Updating section \"%1\" booting other installation to use chainloader entry", s["name"]:""); } @@ -743,6 +743,11 @@ out = maplist (map<string,any> s, out, { string label = s["name"]:""; string type = s["original_name"]:label; + // FIXME: do we still need to remove strings from kernel or initrd names? + // if yes: add "image" + // if no: remove loop + // probably need to do this depending on the version of the old + // installation foreach (string key, ["kernel", "initrd"], { string value = s[key]:""; if (regexpmatch (value, "^.*\.shipped.*$")) @@ -755,7 +760,8 @@ value = regexpsub (value, "^(.*)\.suse(.*)$", "\\1\\2"); } - s["key"] = value; + // This was broken (was: s["key"] = value;) + s[key] = value; }); // If we did not replace the sections anyway, adjust the section titles: // Does this section @@ -788,13 +794,13 @@ && ! contains (recreated, label)) || key == "chainloader") { - string device = s["key"]:""; + string device = s[key]:""; if (device != nil) { y2milestone ("Updating root/other device of section %1", label); device = BootCommon::UpdateDevice (device); - s["key"] = device; + s[key] = device; } } }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org