[yast-commit] r67337 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: VERSION package/yast2-bootloader.changes src/modules/BootCommon.ycp src/modules/Bootloader.ycp src/routines/misc.ycp
Author: snwint
Date: Wed Feb 1 11:48:50 2012
New Revision: 67337
URL: http://svn.opensuse.org/viewcvs/yast?rev=67337&view=rev
Log:
- fix default menu entry detection in zipl.conf (bnc #740324)
Modified:
branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION
branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes
branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp
branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp
branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp
Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION?rev=67337&r1=67336&r2=67337&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Wed Feb 1 11:48:50 2012
@@ -1 +1 @@
-2.17.85
+2.17.86
Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes?rev=67337&r1=67336&r2=67337&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original)
+++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Wed Feb 1 11:48:50 2012
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Jan 27 14:58:43 CET 2012 - snwint@suse.de
+
+- fix default menu entry detection (bnc #740324)
+- 2.17.86
+
+-------------------------------------------------------------------
Fri Jan 13 15:48:55 CET 2012 - snwint@suse.de
- really update bootloader sections after device renaming (bnc #727310)
Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp?rev=67337&r1=67336&r2=67337&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp Wed Feb 1 11:48:50 2012
@@ -440,6 +440,8 @@
global string addMDSettingsToGlobals ();
global boolean VerifyMDArray ();
+// zipl.conf has its own idiosyncrasies when it comes to default entries
+global string checkZiplDefault (string def);
//
// FIXME: the select and selectdevice seem to be broken: the default value of
@@ -1555,6 +1557,69 @@
return ret;
}
+/** bnc #364904
+ * Function parse zipl list names if default section is menu
+ *
+ * @param string (string) list of names
+ * @param string position of default name in list
+ * @return string name of default section from list
+ */
+string parseListDefault(string names, string position)
+{
+ string ret = "";
+
+ y2milestone("section names (string) list: %1 and default name position in list: %2", names, position);
+ if ((names == "") || (position == ""))
+ return ret;
+
+ if (search(names, ",") != nil)
+ {
+ string tmp_names = deletechars(names, " ");
+ list <string> list_names = splitstring(tmp_names, ",");
+ ret = list_names[(tointeger(position)-1)]:"";
+ } else {
+ ret = names;
+ }
+
+ return ret;
+}
+
+/** bnc #364904
+ * Function check if default section is menu
+ * if yes it tries to find default section in
+ * list of names from menu section
+ *
+ * @param string name of default BootCommon::globals["default"]:""
+ * @return string name of default section
+ */
+
+global string checkZiplDefault(string def)
+{
+ string def_section_name = def;
+
+ if (getLoaderType (false) == "zipl")
+ {
+ foreach(map
participants (1)
-
snwint@svn2.opensuse.org