Author: juhliarik
Date: Wed May 20 14:35:05 2009
New Revision: 57267
URL: http://svn.opensuse.org/viewcvs/yast?rev=57267&view=rev
Log:
- fixed several issues for autoyast setting in bootloader
- added support check for ext4
Modified:
trunk/bootloader/VERSION
trunk/bootloader/package/yast2-bootloader.changes
trunk/bootloader/src/modules/BootCommon.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=57267&r1=57266&r2=57267&view=diff
==============================================================================
--- trunk/bootloader/VERSION (original)
+++ trunk/bootloader/VERSION Wed May 20 14:35:05 2009
@@ -1 +1 @@
-2.18.7
+2.18.8
Modified: trunk/bootloader/package/yast2-bootloader.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=57267&r1=57266&r2=57267&view=diff
==============================================================================
--- trunk/bootloader/package/yast2-bootloader.changes (original)
+++ trunk/bootloader/package/yast2-bootloader.changes Wed May 20 14:35:05 2009
@@ -1,4 +1,17 @@
-------------------------------------------------------------------
+Wed May 20 14:20:57 CEST 2009 - juhliarik@suse.cz
+
+- fixed additional options for memory test section (bnc#396150)
+- fixed problems with empty settings in autoyast profile for
+ memory test section (bnc#390659)
+- fixed problem with custom (disable) gfxmenu option in autoyast
+ profile (bnc#380509)
+- fixed deleting gfxmenu option if there is defined serial console
+ (bnc#346576)
+- added support check for ext4 (fate#305691)
+- 2.18.8
+
+-------------------------------------------------------------------
Mon May 18 17:45:52 CEST 2009 - juhliarik@suse.cz
- added fix for changing device map in y2-bootloader (bnc#497944)
Modified: trunk/bootloader/src/modules/BootCommon.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon.ycp?rev=57267&r1=57266&r2=57267&view=diff
==============================================================================
--- trunk/bootloader/src/modules/BootCommon.ycp (original)
+++ trunk/bootloader/src/modules/BootCommon.ycp Wed May 20 14:35:05 2009
@@ -709,6 +709,63 @@
y2error ("No generic propose function available");
}
+/** bnc# 346576 - Bootloader configuration doesn't work for serial output
+ * Function check if settings need to remove gfxmenu
+ *
+ * @return boolean - true if gfxmenu needs to be removed
+ */
+
+boolean removeGFXMenu ()
+{
+ if ((globals["trusted_grub"]:"" == "true") && (haskey(globals, "gfxmenu")))
+ {
+ y2milestone("Remove gfxmenu -> selected trusted grub");
+ return true;
+ }
+
+ if ((globals["serial"]:nil != "") && (globals["serial"]:nil != nil))
+ {
+ y2milestone("Remove gfxmenu -> defined serial console");
+ return true;
+ }
+
+ if (globals["gfxmenu"]:"" == "none")
+ {
+ y2milestone("Remove gfxmenu -> disabled gfxmenu");
+ return true;
+ }
+ return false;
+}
+
+/** bnc #390659 - autoyast bootloader config: empty settings are ignored (memtest)
+ *
+ * Check if sections inlcude section for memtest
+ * if yes delete all unnecessary keys like initrd, vgamode, append...
+ */
+void checkMemtest ()
+{
+ list > out = [];
+
+ foreach(map s, sections,
+ {
+ if (search(s["image"]:"","memtest") != nil)
+ {
+ map tmp_s = $[];
+ tmp_s["image"] = s["image"]:"";
+ tmp_s["original_name"] = s["original_name"]:"";
+ tmp_s["name"] = s["name"]:"";
+ tmp_s["__changed"] = s["__changed"]:false;
+ tmp_s["__auto"] = s["__auto"]:false;
+ tmp_s["type"] = s["type"]:"";
+ y2milestone("Updating memtest section from: %1 to: %2", s, tmp_s);
+ out = add(out, tmp_s);
+ } else {
+ out = add(out, s);
+ }
+ });
+
+ sections = out;
+}
/**
* Save all bootloader configuration files to the cache of the PlugLib
* PlugLib must be initialized properly !!!
@@ -735,6 +792,9 @@
if (bl == "none")
return true;
+ if (removeGFXMenu())
+ globals = remove(globals, "gfxmenu");
+
// FIXME: give mountby information to perl-Bootloader (or define some
// better interface), so that perl-Bootloader can use mountby device names
// for these devices instead. Tracked in bug #248162.
@@ -759,13 +819,15 @@
return $[BootStorage::Dev2MountByDev(k) : v];
});
y2milestone ("device map after mapping %1", my_device_mapping);
- if ((globals["trusted_grub"]:"" == "true") && (haskey(globals, "gfxmenu")))
- globals = remove(globals, "gfxmenu");
+
// convert XEN section to linux section id running in domU
// bnc #436899
ConvertXENinDomU ();
+ // add check if there is memtest and delete from memtest section
+ // keys like append, initrd etc...
+ checkMemtest ();
ret = ret && DefineMultipath(BootStorage::multipath_mapping);
ret = ret && SetDeviceMap (my_device_mapping);
ret = ret && SetSections (sections);
Modified: trunk/bootloader/src/modules/BootSupportCheck.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootSupportCheck.ycp?rev=57267&r1=57266&r2=57267&view=diff
==============================================================================
--- trunk/bootloader/src/modules/BootSupportCheck.ycp (original)
+++ trunk/bootloader/src/modules/BootSupportCheck.ycp Wed May 20 14:35:05 2009
@@ -205,10 +205,11 @@
if ((tolower(p["fstype"]:"") == "md raid") &&
(BootCommon::globals["boot_mbr"]:"false" != "true"))
{
- result = false;
AddNewProblem (_("The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"));
y2error("Booting from soft-raid: %1 and bootloader setting are not valid: %2",
p, BootCommon::globals);
+ result = false;
+ break;
} else {
found_boot = true;
y2milestone("Valid configuration for soft-raid");
@@ -219,7 +220,16 @@
y2milestone("The boot device: %1 is on raid: %2", boot_device, p["raid_type"]:"");
}
}
+
// check if /boot directory is on supported filesystem
+ // FATE#305691 -> Support ext4 as installation option
+ if (p["used_fs"]:nil == `ext4)
+ {
+ AddNewProblem (_("The /boot directory is on an ext4 filesystem. Create separate /boot partition with ext2 filesytem"));
+ y2error ("The /boot directory is on an ext4 filesystem");
+ result = false;
+ break;
+ }
if (p["used_fs"]:nil == `xfs)
{
AddNewProblem (_("The /boot directory is on an XFS filesystem. System may not boot."));
Modified: trunk/bootloader/src/routines/lilolike.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike.ycp?rev=57267&r1=57266&r2=57267&view=diff
==============================================================================
--- trunk/bootloader/src/routines/lilolike.ycp (original)
+++ trunk/bootloader/src/routines/lilolike.ycp Wed May 20 14:35:05 2009
@@ -947,7 +947,11 @@
return UpdateDevice (d);
});
BootCommon::globals["stage1_dev"] = mergestring (s1_devs, ",");
- BootCommon::globals["gfxmenu"] = "/boot/message";
+
+ // bnc #380509 if autoyast profile includes gfxmenu == none
+ // it will be deleted
+ if (BootCommon::globals["gfxmenu"]:"" != "none")
+ BootCommon::globals["gfxmenu"] = "/boot/message";
// now that the label for the "linux" section is not "linux" anymore, but
// some product dependent string that can change with an update ("SLES_10"
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
