Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Sun Apr 20 15:45:53 CEST 2008.
--------
--- yast2-bootloader/yast2-bootloader.changes 2008-04-16 15:44:49.000000000 +0200
+++ yast2-bootloader/yast2-bootloader.changes 2008-04-18 16:06:09.000000000 +0200
@@ -1,0 +2,20 @@
+Fri Apr 18 15:52:47 CEST 2008 - juhliarik@suse.cz
+
+- added fix for (bnc# 381192) bootloader uses grubonce _and_ kexec
+- added detecting VirtualBox - cancel using kexec
+- 2.16.12
+
+-------------------------------------------------------------------
+Thu Apr 17 20:19:04 CEST 2008 - juhliarik@suse.cz
+
+- new version
+- 2.16.11
+
+-------------------------------------------------------------------
+Thu Apr 17 20:02:19 CEST 2008 - locilka@suse.cz, juhliarik@suse.cz
+
+- fixed initializing of combo-box widgets in dialogs, ComboBox
+ in Qt does not accept `Value, using `Items instead (bnc #380781).
+- using `InputField as a replacement for obsolete `TextEntry.
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-2.16.10.tar.bz2
New:
----
yast2-bootloader-2.16.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.w29464/_old 2008-04-20 15:45:01.000000000 +0200
+++ /var/tmp/diff_new_pack.w29464/_new 2008-04-20 15:45:02.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.16.10)
+# spec file for package yast2-bootloader (Version 2.16.12)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-bootloader
-Version: 2.16.10
+Version: 2.16.12
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.16.10.tar.bz2
+Source0: yast2-bootloader-2.16.12.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:
@@ -54,7 +54,7 @@
Daniel Fiser
%prep
-%setup -n yast2-bootloader-2.16.10
+%setup -n yast2-bootloader-2.16.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -99,6 +99,17 @@
/var/adm/fillup-templates/*
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Fri Apr 18 2008 juhliarik@suse.cz
+- added fix for (bnc# 381192) bootloader uses grubonce _and_ kexec
+- added detecting VirtualBox - cancel using kexec
+- 2.16.12
+* Thu Apr 17 2008 juhliarik@suse.cz
+- new version
+- 2.16.11
+* Thu Apr 17 2008 locilka@suse.cz, juhliarik@suse.cz
+- fixed initializing of combo-box widgets in dialogs, ComboBox
+ in Qt does not accept `Value, using `Items instead (bnc #380781).
+- using `InputField as a replacement for obsolete `TextEntry.
* Wed Apr 16 2008 juhliarik@suse.cz
- added fix for activating DM-RAID boot partition (bnc #337742)
- added fix for lilo and raid version (bnc #357897)
++++++ yast2-bootloader-2.16.10.tar.bz2 -> yast2-bootloader-2.16.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.10/src/clients/bootloader_finish.ycp new/yast2-bootloader-2.16.12/src/clients/bootloader_finish.ycp
--- old/yast2-bootloader-2.16.10/src/clients/bootloader_finish.ycp 2008-04-11 15:51:06.000000000 +0200
+++ new/yast2-bootloader-2.16.12/src/clients/bootloader_finish.ycp 2008-04-18 15:52:38.000000000 +0200
@@ -9,7 +9,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: bootloader_finish.ycp 46420 2008-04-11 13:53:31Z juhliarik $
+ * $Id: bootloader_finish.ycp 46857 2008-04-18 13:53:36Z juhliarik $
*
*/
@@ -182,13 +182,17 @@
Bootloader::Read ();
// fate #303395: Use kexec to avoid booting between first and second stage
// copy vmlinuz, initrd and flush kernel option into /var/lib/YaST2
- if (Linuxrc::InstallInf ("kexec_reboot") != "0")
- Bootloader::CopyKernelInird();
- else
- y2milestone("Installation started with kexec_reboot set 0 or without kexec_reboot option");
-
+ retcode = false;
+ if (Linuxrc::InstallInf ("kexec_reboot") == "1")
+ {
+ retcode = Bootloader::CopyKernelInird();
+ } else {
+ y2milestone("Installation started with kexec_reboot set 0");
+ }
- return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ());
+ // (bnc #381192) don't use it if kexec is used
+ if (!retcode)
+ return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ());
}
else
return retcode;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.10/src/generic/widget_funcs.ycp new/yast2-bootloader-2.16.12/src/generic/widget_funcs.ycp
--- old/yast2-bootloader-2.16.10/src/generic/widget_funcs.ycp 2008-03-13 18:44:05.000000000 +0100
+++ new/yast2-bootloader-2.16.12/src/generic/widget_funcs.ycp 2008-04-17 20:27:30.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Joachim Plack
*
- * $Id: widget_funcs.ycp 45442 2008-03-13 17:38:32Z juhliarik $
+ * $Id: widget_funcs.ycp 46799 2008-04-17 18:26:04Z locilka $
*
*/
@@ -111,11 +111,11 @@
if ( type == "radio" || type == "check") {
new = `Left(`HBox (
enable_widget,
- `TextEntry(`id( key ), "")
+ `InputField(`id( key ), `opt (`hstretch), "")
));
}
else {
- new = `TextEntry(`id( key ), desc);
+ new = `InputField(`id( key ), `opt (`hstretch), desc);
}
}
else if (value == "password") {
@@ -299,7 +299,14 @@
}
else if (contains(["string", "path", "select", "selectdevice"],
(string)value)) {
- UI::ChangeWidget (`id (key), `Value, data[key]:"");
+
+ // ComboBox doesn't accept `Value, use `Items instead
+ // See bnc #380781
+ if (UI::QueryWidget (`id (key), `WidgetClass) == "YComboBox") {
+ UI::ChangeWidget (`id (key), `Items, [data[key]:""]);
+ } else {
+ UI::ChangeWidget (`id (key), `Value, data[key]:"");
+ }
}
else if (value == "password") {
UI::ChangeWidget (`id (key + "_pw1"), `Value, "**********");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.10/src/modules/Bootloader.ycp new/yast2-bootloader-2.16.12/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.16.10/src/modules/Bootloader.ycp 2008-04-11 15:51:06.000000000 +0200
+++ new/yast2-bootloader-2.16.12/src/modules/Bootloader.ycp 2008-04-18 15:52:38.000000000 +0200
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: Bootloader.ycp 46420 2008-04-11 13:53:31Z juhliarik $
+ * $Id: Bootloader.ycp 46857 2008-04-18 13:53:36Z juhliarik $
*
*/
@@ -1216,6 +1216,19 @@
y2milestone("Option kexec_reboot is false. kexec will not be used.");
return true;
}
+
+ // checking if installation run on VirtualBox
+ string cmd = sformat("hwinfo --bios |grep Product");
+ y2milestone("Checking if installation run on VirtualBox command: %1", cmd);
+
+ map out = (map)WFM::Execute(.local.bash_output, cmd);
+
+ if (find(out["stdout"]:"", "VirtualBox") != -1)
+ {
+ y2milestone ("Installation run on VirtualBox, skip kexec loading: %1", out);
+ return false;
+ }
+
// create defualt sections
map linux_default = BootCommon::CreateLinuxSection ("linux");
@@ -1240,13 +1253,13 @@
WFM::Execute(.local.mkdir, "/var/lib/YaST2");
// build command for copy kernel and initrd to /var/lib/YaST during instalation
- string cmd = nil;
+ cmd = nil;
cmd = sformat("/bin/cp %1%2 %1%3 %4", Installation::destdir, tostring(default_section["image"]:""),
tostring(default_section["initrd"]:""), Directory::vardir);
y2milestone("Command for copy: %1", cmd);
- map out = (map) WFM::Execute (.local.bash_output, cmd);
+ out = (map) WFM::Execute (.local.bash_output, cmd);
if (out["exit"]:nil != 0)
{
y2error ("Copy kernel and initrd failed, output: %1", out);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.10/src/routines/dialogs_i386.ycp new/yast2-bootloader-2.16.12/src/routines/dialogs_i386.ycp
--- old/yast2-bootloader-2.16.10/src/routines/dialogs_i386.ycp 2007-02-09 13:57:13.000000000 +0100
+++ new/yast2-bootloader-2.16.12/src/routines/dialogs_i386.ycp 2008-04-17 20:27:30.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: dialogs_i386.ycp 32382 2006-08-16 13:12:24Z jplack $
+ * $Id: dialogs_i386.ycp 46799 2008-04-17 18:26:04Z locilka $
*
*/
@@ -121,7 +121,7 @@
{
term popup = `VBox (`VSpacing (1),
// textentry header
- `TextEntry (`id (`devname), _("&Device")),
+ `InputField (`id (`devname), `opt (`hstretch), _("&Device")),
`VSpacing (1),
`HBox (`HStretch (),
`PushButton (`id (`ok), `opt (`key_F10, `default),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.10/src/routines/global_widgets.ycp new/yast2-bootloader-2.16.12/src/routines/global_widgets.ycp
--- old/yast2-bootloader-2.16.10/src/routines/global_widgets.ycp 2007-12-10 14:32:50.000000000 +0100
+++ new/yast2-bootloader-2.16.12/src/routines/global_widgets.ycp 2008-04-17 20:27:30.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: global_widgets.ycp 41687 2007-10-31 13:32:10Z dfiser $
+ * $Id: global_widgets.ycp 46799 2008-04-17 18:26:04Z locilka $
*
*/
@@ -105,7 +105,9 @@
list sec = maplist (map s, sects, {
string image = s["kernel"]:"";
string root = (BootCommon::getHintedPartitionList ([s["root"]:""]))[0]:"";
+
return `item (`id (s["name"]:""),
+ // FIXME: do not match against key "name" (can be changed by user when editing section)
tolower (BootCommon::globals["default"]:"")
== tolower (s["name"]:"")
? UI::Glyph (`CheckMark) : "",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.10/src/routines/section_widgets.ycp new/yast2-bootloader-2.16.12/src/routines/section_widgets.ycp
--- old/yast2-bootloader-2.16.10/src/routines/section_widgets.ycp 2007-12-10 14:32:50.000000000 +0100
+++ new/yast2-bootloader-2.16.12/src/routines/section_widgets.ycp 2008-04-17 20:27:30.000000000 +0200
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: section_widgets.ycp 41373 2007-10-11 12:55:01Z odabrunz $
+ * $Id: section_widgets.ycp 46799 2008-04-17 18:26:04Z locilka $
*
*/
@@ -350,7 +350,7 @@
"kernel" : $[
"widget" : `custom,
"custom_widget" : Stage::initial ()
- ? `TextEntry (`id ("kernel"), `opt (`hstretch),
+ ? `InputField (`id ("kernel"), `opt (`hstretch),
// text entry
_("&Kernel"))
: `HBox (
@@ -372,7 +372,7 @@
"initrd" : $[
"widget" : `custom,
"custom_widget" : Stage::initial ()
- ? `TextEntry (`id ("initrd"), `opt (`hstretch),
+ ? `InputField (`id ("initrd"), `opt (`hstretch),
// text entry
_("&Initial RAM Disk"))
: `HBox (
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.10/VERSION new/yast2-bootloader-2.16.12/VERSION
--- old/yast2-bootloader-2.16.10/VERSION 2008-04-16 15:22:08.000000000 +0200
+++ new/yast2-bootloader-2.16.12/VERSION 2008-04-18 15:54:22.000000000 +0200
@@ -1 +1 @@
-2.16.10
+2.16.12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org