Hello community,
here is the log from the commit of package yast2-bootloader for openSUSE:Factory
checked in at Thu Dec 4 13:07:37 CET 2008.
--------
--- yast2-bootloader/yast2-bootloader.changes 2008-12-01 18:28:26.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-12-04 10:05:25.000000000 +0100
@@ -1,0 +2,16 @@
+Thu Dec 4 09:34:22 CET 2008 - juhliarik@suse.cz
+
+- 2.17.45
+
+-------------------------------------------------------------------
+Tue Dec 2 16:28:27 CET 2008 - juhliarik@suse.cz
+
+- added fix for onetime boot if default is windows (bnc #339024)
+
+-------------------------------------------------------------------
+Tue Dec 2 15:35:30 CET 2008 - juhliarik@suse.cz
+
+- updated heuristic for adding other OS to menu.lst for GRUB
+ (bnc #448010)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-bootloader-2.17.44.tar.bz2
New:
----
yast2-bootloader-2.17.45.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.f32192/_old 2008-12-04 13:06:57.000000000 +0100
+++ /var/tmp/diff_new_pack.f32192/_new 2008-12-04 13:06:57.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.17.44)
+# spec file for package yast2-bootloader (Version 2.17.45)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-bootloader
-Version: 2.17.44
+Version: 2.17.45
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.17.44.tar.bz2
+Source0: yast2-bootloader-2.17.45.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:
@@ -68,7 +68,7 @@
Daniel Fiser
%prep
-%setup -n yast2-bootloader-2.17.44
+%setup -n yast2-bootloader-2.17.45
%build
%{prefix}/bin/y2tool y2autoconf
@@ -114,6 +114,13 @@
/var/adm/fillup-templates/*
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Thu Dec 04 2008 juhliarik@suse.cz
+- 2.17.45
+* Tue Dec 02 2008 juhliarik@suse.cz
+- added fix for onetime boot if default is windows (bnc #339024)
+* Tue Dec 02 2008 juhliarik@suse.cz
+- updated heuristic for adding other OS to menu.lst for GRUB
+ (bnc #448010)
* Mon Dec 01 2008 juhliarik@suse.cz
- added fix for proposal if MBR include Vista code and "/" is on
logical partition (bnc #450137)
++++++ yast2-bootloader-2.17.44.tar.bz2 -> yast2-bootloader-2.17.45.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.44/src/clients/bootloader_finish.ycp new/yast2-bootloader-2.17.45/src/clients/bootloader_finish.ycp
--- old/yast2-bootloader-2.17.44/src/clients/bootloader_finish.ycp 2008-09-16 10:55:48.000000000 +0200
+++ new/yast2-bootloader-2.17.45/src/clients/bootloader_finish.ycp 2008-12-02 16:37:49.000000000 +0100
@@ -9,7 +9,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: bootloader_finish.ycp 51175 2008-09-16 08:55:47Z juhliarik $
+ * $Id: bootloader_finish.ycp 53825 2008-12-02 15:37:48Z juhliarik $
*
*/
@@ -202,8 +202,25 @@
}
// (bnc #381192) don't use it if kexec is used
+ // update calling onetime boot bnc #339024
if (!retcode)
- return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ());
+ {
+ string bl = Bootloader::getLoaderType();
+ if (bl == "grub")
+ {
+ if (BootCommon::isDefaultBootSectioLinux(Bootloader::getDefaultSection ()))
+ {
+ return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ());
+ } else {
+ return Bootloader::FlagOnetimeBoot(BootCommon::findRelativeDefaultLinux ());
+ }
+
+ } else {
+
+ return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ());
+
+ }
+ }
}
else
return retcode;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.44/src/modules/BootCommon.ycp new/yast2-bootloader-2.17.45/src/modules/BootCommon.ycp
--- old/yast2-bootloader-2.17.44/src/modules/BootCommon.ycp 2008-12-01 18:27:07.000000000 +0100
+++ new/yast2-bootloader-2.17.45/src/modules/BootCommon.ycp 2008-12-02 16:37:49.000000000 +0100
@@ -15,7 +15,7 @@
* Joachim Plack
* Olaf Dabrunz
*
- * $Id: BootCommon.ycp 53790 2008-12-01 17:27:06Z juhliarik $
+ * $Id: BootCommon.ycp 53825 2008-12-02 15:37:48Z juhliarik $
*
*/
@@ -369,6 +369,8 @@
global define boolean UsingXenPae();
global map CreateLinuxSection (string title);
global string UpdateSerialConsole (string append, string console);
+
+
//
// FIXME: the select and selectdevice seem to be broken: the default value of
// the widget description string needs to be patched with the current value of
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.44/src/modules/BootGRUB.ycp new/yast2-bootloader-2.17.45/src/modules/BootGRUB.ycp
--- old/yast2-bootloader-2.17.44/src/modules/BootGRUB.ycp 2008-12-01 18:27:07.000000000 +0100
+++ new/yast2-bootloader-2.17.45/src/modules/BootGRUB.ycp 2008-12-02 15:37:09.000000000 +0100
@@ -15,7 +15,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootGRUB.ycp 53790 2008-12-01 17:27:06Z juhliarik $
+ * $Id: BootGRUB.ycp 53822 2008-12-02 14:37:09Z juhliarik $
*
*/
@@ -285,9 +285,13 @@
= BootCommon::GetSections ();
y2debug ("Found sections %1", sects);
+ // bnc #448010 grub doesn't add another installed Linux in installation
+ map globs = BootCommon::GetGlobal ();
+ string default_sec_name = globs["default"]:"";
+
// look only for "default" == "initial" entries, not all entries
sects = filter (map s, sects, {
- return s["initial"]:nil != nil;
+ return ((s["initial"]:nil != nil) || (s["name"]:nil == default_sec_name));
});
// now find the name of the first non-broken "initial" section and get its name
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.44/src/routines/misc.ycp new/yast2-bootloader-2.17.45/src/routines/misc.ycp
--- old/yast2-bootloader-2.17.44/src/routines/misc.ycp 2008-12-01 18:27:07.000000000 +0100
+++ new/yast2-bootloader-2.17.45/src/routines/misc.ycp 2008-12-04 09:35:12.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: misc.ycp 53790 2008-12-01 17:27:06Z juhliarik $
+ * $Id: misc.ycp 53862 2008-12-04 08:35:11Z juhliarik $
*
* WARNING:
* To be included to BootCommon.ycp only, requires function
@@ -2016,6 +2016,23 @@
return value;
}
+/**
+ * Fuction delete " " on the beginning of string
+ *
+ */
+
+string delete_white_space(string temp)
+{
+ string ret = temp;
+ while (findfirstof(temp," ") == 0)
+ {
+ temp = substring(temp, 1);
+
+ }
+ ret = temp;
+ return temp;
+}
+
/** bnc #440125 - default boot section with failsafe args
* Compare append from default linux section with append from
@@ -2026,7 +2043,9 @@
boolean compareAppends(string default_append, string section_append)
{
integer deuce = 0;
-
+ // delete white space on the beginning of string
+ default_append = delete_white_space(default_append);
+ section_append = delete_white_space(section_append);
// check valid append for section
if (size(section_append) < 3)
return false;
@@ -2089,7 +2108,7 @@
* @return string name of default boot section
*/
-string findRelativeDefaultLinux ()
+global string findRelativeDefaultLinux ()
{
string default_linux = "";
@@ -2118,7 +2137,7 @@
* @param string default boot name
* @return boolean true if boot name is linux
*/
-boolean isDefaultBootSectioLinux(string default_boot)
+global boolean isDefaultBootSectioLinux(string default_boot)
{
boolean ret = false;
foreach(maps, BootCommon::sections,
@@ -2515,7 +2534,7 @@
{
sections[idx, "console"] = console_value;
sections[idx, "__changed"] = true;
- if (sections[idx, "append"]:"" != "")
+ if (sections[idx, "append"]:nil != nil)
{
string updated_append =
BootCommon::UpdateSerialConsole(sections[idx,"append"]:"",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.44/VERSION new/yast2-bootloader-2.17.45/VERSION
--- old/yast2-bootloader-2.17.44/VERSION 2008-12-01 16:17:07.000000000 +0100
+++ new/yast2-bootloader-2.17.45/VERSION 2008-12-03 10:04:16.000000000 +0100
@@ -1 +1 @@
-2.17.44
+2.17.45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org