Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Tue Sep 16 17:42:43 CEST 2008.
--------
--- yast2-bootloader/yast2-bootloader.changes 2008-09-16 11:04:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-09-16 17:10:12.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Sep 16 16:35:43 CEST 2008 - juhliarik@suse.cz
+
+- added fix for getDefaultSection() for zipl (bnc #364904)
+- added fix for deleting gfxmenu from menu.lst (bnc #398806)
+- 2.17.19
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-2.17.18.tar.bz2
New:
----
yast2-bootloader-2.17.19.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.U29734/_old 2008-09-16 17:42:29.000000000 +0200
+++ /var/tmp/diff_new_pack.U29734/_new 2008-09-16 17:42:29.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.17.18)
+# spec file for package yast2-bootloader (Version 2.17.19)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-bootloader
-Version: 2.17.18
+Version: 2.17.19
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.17.18.tar.bz2
+Source0: yast2-bootloader-2.17.19.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite
# to eliminate a cyclic dependency in autobuild:
@@ -61,7 +61,7 @@
Daniel Fiser
%prep
-%setup -n yast2-bootloader-2.17.18
+%setup -n yast2-bootloader-2.17.19
%build
%{prefix}/bin/y2tool y2autoconf
@@ -107,6 +107,10 @@
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
* Tue Sep 16 2008 juhliarik@suse.cz
+- added fix for getDefaultSection() for zipl (bnc #364904)
+- added fix for deleting gfxmenu from menu.lst (bnc #398806)
+- 2.17.19
+* Tue Sep 16 2008 juhliarik@suse.cz
- added fix for problem with rnc file - syntax error (bnc #426522)
- 2.17.18
* Fri Sep 12 2008 juhliarik@suse.cz
++++++ yast2-bootloader-2.17.18.tar.bz2 -> yast2-bootloader-2.17.19.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.18/src/modules/Bootloader.ycp new/yast2-bootloader-2.17.19/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.17.18/src/modules/Bootloader.ycp 2008-08-06 15:42:22.000000000 +0200
+++ new/yast2-bootloader-2.17.19/src/modules/Bootloader.ycp 2008-09-16 16:35:43.000000000 +0200
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: Bootloader.ycp 49775 2008-08-06 13:42:22Z juhliarik $
+ * $Id: Bootloader.ycp 51190 2008-09-16 14:35:42Z juhliarik $
*
*/
@@ -899,13 +899,77 @@
y2milestone("sections after remapping: %1", BootCommon::sections);
}
+/** 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
+ */
+
+string checkZiplDefault(string def)
+{
+ string def_section_name = def;
+
+ if (getLoaderType () == "zipl")
+ {
+ foreach(map section, BootCommon::sections,
+ {
+ if (section["name"]:"" == def_section_name)
+ {
+ if (section["type"]:"" == "menu")
+ {
+ string def_position = section["default"]:"";
+ def_section_name = parseListDefault(section["list"]:"", def_position);
+
+ } else {
+ break;
+ }
+ }
+ });
+
+ }
+
+ y2milestone("name of default section for zipl: %1", def_section_name);
+ return def_section_name;
+}
+
/**
* return default section label
* @return string default section label
*/
global define string getDefaultSection () {
ReadOrProposeIfNeeded ();
- return BootCommon::globals["default"]:"";
+ string default_name = BootCommon::globals["default"]:"";
+ return default_name;
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.18/src/routines/lilolike.ycp new/yast2-bootloader-2.17.19/src/routines/lilolike.ycp
--- old/yast2-bootloader-2.17.18/src/routines/lilolike.ycp 2008-08-13 14:36:36.000000000 +0200
+++ new/yast2-bootloader-2.17.19/src/routines/lilolike.ycp 2008-09-16 16:35:43.000000000 +0200
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: lilolike.ycp 50018 2008-08-13 12:36:36Z juhliarik $
+ * $Id: lilolike.ycp 51190 2008-09-16 14:35:42Z juhliarik $
*
*/
{
@@ -1184,7 +1184,7 @@
*/
global void UpdateGfxMenu () {
string message = globals["gfxmenu"]:"";
- if (message != "")
+ if ((message != "") && (search(message, "(") == nil))
{
if (-1 == SCR::Read (.target.size, message))
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.18/VERSION new/yast2-bootloader-2.17.19/VERSION
--- old/yast2-bootloader-2.17.18/VERSION 2008-09-16 10:58:00.000000000 +0200
+++ new/yast2-bootloader-2.17.19/VERSION 2008-09-16 16:37:32.000000000 +0200
@@ -1 +1 @@
-2.17.18
+2.17.19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org