Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Wed Sep 26 21:38:15 CEST 2007.
--------
--- yast2-bootloader/yast2-bootloader.changes 2007-09-25 19:07:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/STABLE/yast2-bootloader/yast2-bootloader.changes 2007-09-26 21:24:27.237730000 +0200
@@ -1,0 +2,11 @@
+Wed Sep 26 21:22:58 CEST 2007 - od@suse.de
+
+- added flag avoid_reading_device_map to blRead(), all internal
+ Read()s and ReadSettings() interface to perl-Bootloader: used by
+ BootLILO and BootGRUB during update to migrate device names in
+ the device_map and then re-read the config files with correct
+ device name translation (#328448)
+- do not install bootloader in XEN paravirtualized DomU (#308451)
+- 2.15.29
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-2.15.28.tar.bz2
New:
----
yast2-bootloader-2.15.29.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.F17465/_old 2007-09-26 21:37:55.000000000 +0200
+++ /var/tmp/diff_new_pack.F17465/_new 2007-09-26 21:37:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.15.28)
+# spec file for package yast2-bootloader (Version 2.15.29)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-bootloader
-Version: 2.15.28
+Version: 2.15.29
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.15.28.tar.bz2
+Source0: yast2-bootloader-2.15.29.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:
@@ -50,7 +50,7 @@
Olaf Dabrunz
%prep
-%setup -n yast2-bootloader-2.15.28
+%setup -n yast2-bootloader-2.15.29
%build
%{prefix}/bin/y2tool y2autoconf
@@ -94,6 +94,14 @@
/var/adm/fillup-templates/*
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Wed Sep 26 2007 - od@suse.de
+- added flag avoid_reading_device_map to blRead(), all internal
+ Read()s and ReadSettings() interface to perl-Bootloader: used by
+ BootLILO and BootGRUB during update to migrate device names in
+ the device_map and then re-read the config files with correct
+ device name translation (#328448)
+- do not install bootloader in XEN paravirtualized DomU (#308451)
+- 2.15.29
* Tue Sep 25 2007 - od@suse.de
- re-read bootloader config from system after the delayed run of
perl-Bootloader updates, then call FlagOnetimeBoot() based on
++++++ yast2-bootloader-2.15.28.tar.bz2 -> yast2-bootloader-2.15.29.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.28/src/modules/BootCommon.ycp new/yast2-bootloader-2.15.29/src/modules/BootCommon.ycp
--- old/yast2-bootloader-2.15.28/src/modules/BootCommon.ycp 2007-09-25 11:09:41.000000000 +0200
+++ new/yast2-bootloader-2.15.29/src/modules/BootCommon.ycp 2007-09-26 21:17:09.000000000 +0200
@@ -15,7 +15,7 @@
* Joachim Plack
* Olaf Dabrunz
*
- * $Id: BootCommon.ycp 41073 2007-09-25 09:09:41Z odabrunz $
+ * $Id: BootCommon.ycp 41120 2007-09-26 19:17:08Z odabrunz $
*
*/
@@ -611,16 +611,18 @@
/**
* Read settings from disk
* @param reread boolean true to force reread settings from system
+ * @param avoid_reading_device_map do not read new device map from file, use
+ * internal data
* @return boolean true on success
*/
-global boolean Read (boolean reread) {
+global boolean Read (boolean reread, boolean avoid_reading_device_map) {
string bl = getLoaderType (false);
if (bl == "none")
return true;
InitializeLibrary (reread, bl);
if (reread)
{
- BootCommon::ReadFiles ();
+ BootCommon::ReadFiles (avoid_reading_device_map);
}
sections = GetSections ();
globals = GetGlobal ();
@@ -925,9 +927,10 @@
if (loader_type == "s390")
loader_type = "zipl";
y2milestone ("Bootloader detection returned %1", loader_type);
- if (Arch::is_uml ())
+ // lslezak@: Arch::is_xenU() returns true only in PV guest
+ if (Arch::is_uml () || Arch::is_xenU())
{
- y2milestone ("Not installing any bootloader for UML");
+ y2milestone ("Not installing any bootloader for UML/Xen PV");
loader_type = "none";
}
if (loader_type == "grub" && Storage::UseLilo())
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.28/src/modules/BootELILO.ycp new/yast2-bootloader-2.15.29/src/modules/BootELILO.ycp
--- old/yast2-bootloader-2.15.28/src/modules/BootELILO.ycp 2007-09-21 16:18:20.000000000 +0200
+++ new/yast2-bootloader-2.15.29/src/modules/BootELILO.ycp 2007-09-26 21:17:09.000000000 +0200
@@ -16,7 +16,7 @@
* Andreas Schwab
* Philipp Thomas
*
- * $Id: BootELILO.ycp 41027 2007-09-21 14:18:17Z odabrunz $
+ * $Id: BootELILO.ycp 41120 2007-09-26 19:17:08Z odabrunz $
*
*/
@@ -202,9 +202,12 @@
/**
* Read settings from disk
+ * @param reread boolean true to force reread settings from system
+ * @param avoid_reading_device_map do not read new device map from file, use
+ * internal data
* @return boolean true on success
*/
-global define boolean Read (boolean reread) {
+global define boolean Read (boolean reread, boolean avoid_reading_device_map) {
import "Product";
boolean efi_entry_found = false;
elilo_conf_filename = getEliloConfFilename ();
@@ -218,7 +221,7 @@
}
SCR::Execute (.target.bash, "/bin/touch /etc/elilo.conf");
BootCommon::DetectDisks ();
- boolean ret = BootCommon::Read (reread);
+ boolean ret = BootCommon::Read (reread, avoid_reading_device_map);
// check for meaningless EFI entry name in sysconfig
if ( !haskey(BootCommon::globals,"boot_efilabel")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.28/src/modules/BootGRUB.ycp new/yast2-bootloader-2.15.29/src/modules/BootGRUB.ycp
--- old/yast2-bootloader-2.15.28/src/modules/BootGRUB.ycp 2007-09-21 16:18:21.000000000 +0200
+++ new/yast2-bootloader-2.15.29/src/modules/BootGRUB.ycp 2007-09-26 21:17:10.000000000 +0200
@@ -14,7 +14,7 @@
* Joachim Plack
* Philipp Thomas
*
- * $Id: BootGRUB.ycp 41027 2007-09-21 14:18:17Z odabrunz $
+ * $Id: BootGRUB.ycp 41120 2007-09-26 19:17:08Z odabrunz $
*
*/
@@ -617,15 +617,17 @@
/**
* Read settings from disk
* @param reread boolean true to force reread settings from system
+ * @param avoid_reading_device_map do not read new device map from file, use
+ * internal data
* @return boolean true on success
*/
-global boolean Read (boolean reread) {
+global boolean Read (boolean reread, boolean avoid_reading_device_map) {
BootCommon::InitializeLibrary (reread, "grub");
if (reread) {
- BootCommon::ReadFiles ();
+ BootCommon::ReadFiles (avoid_reading_device_map);
}
grub_DetectDisks ();
- boolean ret = BootCommon::Read (false);
+ boolean ret = BootCommon::Read (false, avoid_reading_device_map);
// refresh device map if not read
if (BootCommon::device_mapping == nil
|| size (BootCommon::device_mapping) == 0)
@@ -957,6 +959,18 @@
*/
global define void Update () {
BootCommon::UpdateDeviceMap ();
+
+ // During update, for libata device name migration ("/dev/hda1" ->
+ // "/dev/sda1") and somesuch, we need to re-read and parse the rest of the
+ // configuration file contents after internally updating the device map in
+ // perl-Bootloader. This way, the device names are consistent with the
+ // partitioning information we have set up in perl-Bootloader with
+ // SetDiskInfo(), and device names in other config files can be translated
+ // to Unix device names (#328448, this hits sections that are not
+ // (re-)created by yast-Bootloader or later by perl-Bootloader anyway).
+ BootCommon::SetDeviceMap (BootCommon::device_mapping);
+ Read (true, true);
+
BootCommon::UpdateSections (true, CreateLinuxSection);
BootCommon::UpdateGlobals ();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.28/src/modules/BootLILO.ycp new/yast2-bootloader-2.15.29/src/modules/BootLILO.ycp
--- old/yast2-bootloader-2.15.28/src/modules/BootLILO.ycp 2007-09-21 16:18:22.000000000 +0200
+++ new/yast2-bootloader-2.15.29/src/modules/BootLILO.ycp 2007-09-26 21:17:11.000000000 +0200
@@ -13,7 +13,7 @@
* Jiri Srain
* Philipp Thomas
*
- * $Id: BootLILO.ycp 41027 2007-09-21 14:18:17Z odabrunz $
+ * $Id: BootLILO.ycp 41120 2007-09-26 19:17:08Z odabrunz $
*
*/
@@ -163,16 +163,18 @@
/**
* Read settings from disk
* @param reread boolean true to force reread settings from system
+ * @param avoid_reading_device_map do not read new device map from file, use
+ * internal data
* @return boolean true on success
*/
-global boolean Read (boolean reread) {
+global boolean Read (boolean reread, boolean avoid_reading_device_map) {
BootCommon::InitializeLibrary (reread, "lilo");
if (reread)
{
- BootCommon::ReadFiles ();
+ BootCommon::ReadFiles (avoid_reading_device_map);
}
BootCommon::DetectDisks ();
- boolean ret = BootCommon::Read (false);
+ boolean ret = BootCommon::Read (false, avoid_reading_device_map);
BootCommon::loader_device = BootCommon::globals["stage1_dev"]:"";
return ret;
}
@@ -198,6 +200,18 @@
*/
global void Update () {
BootCommon::UpdateDeviceMap ();
+
+ // During update, for libata device name migration ("/dev/hda1" ->
+ // "/dev/sda1") and somesuch, we need to re-read and parse the rest of the
+ // configuration file contents after internally updating the device map in
+ // perl-Bootloader. This way, the device names are consistent with the
+ // partitioning information we have set up in perl-Bootloader with
+ // SetDiskInfo(), and device names in other config files can be translated
+ // to Unix device names (#328448, this hits sections that are not
+ // (re-)created by yast-Bootloader or later by perl-Bootloader anyway).
+ BootCommon::SetDeviceMap (BootCommon::device_mapping);
+ Read (true, true);
+
BootCommon::UpdateSections (true, BootCommon::CreateLinuxSection);
BootCommon::UpdateGlobals ();
BootCommon::loader_device
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.28/src/modules/Bootloader_API.pm new/yast2-bootloader-2.15.29/src/modules/Bootloader_API.pm
--- old/yast2-bootloader-2.15.28/src/modules/Bootloader_API.pm 2007-07-03 14:23:08.000000000 +0200
+++ new/yast2-bootloader-2.15.29/src/modules/Bootloader_API.pm 2007-09-26 19:41:02.000000000 +0200
@@ -80,10 +80,11 @@
return $ret;
}
-BEGIN { $TYPEINFO{readSettings} = ["function", "boolean"]; }
+BEGIN { $TYPEINFO{readSettings} = ["function", "boolean", "boolean"]; }
# read configuration
sub readSettings() {
- my $ret = $lib_ref->ReadSettings();
+ my ($avoid_reading_device_map) = @_;
+ my $ret = $lib_ref->ReadSettings($avoid_reading_device_map);
DumpLog();
return $ret ? "true" : "false";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.28/src/modules/Bootloader.ycp new/yast2-bootloader-2.15.29/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.15.28/src/modules/Bootloader.ycp 2007-09-21 16:18:24.000000000 +0200
+++ new/yast2-bootloader-2.15.29/src/modules/Bootloader.ycp 2007-09-26 21:17:13.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: Bootloader.ycp 41027 2007-09-21 14:18:17Z odabrunz $
+ * $Id: Bootloader.ycp 41120 2007-09-26 19:17:08Z odabrunz $
*
*/
@@ -223,7 +223,7 @@
if (testAbort ())
return false;
- boolean ret = blRead (true);
+ boolean ret = blRead (true, false);
BootCommon::was_read = true;
old_vga = getKernelParam (getDefaultSection (), "vga");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.28/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.15.29/src/modules/BootPOWERLILO.ycp
--- old/yast2-bootloader-2.15.28/src/modules/BootPOWERLILO.ycp 2007-09-21 16:18:23.000000000 +0200
+++ new/yast2-bootloader-2.15.29/src/modules/BootPOWERLILO.ycp 2007-09-26 21:17:11.000000000 +0200
@@ -16,7 +16,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootPOWERLILO.ycp 41027 2007-09-21 14:18:17Z odabrunz $
+ * $Id: BootPOWERLILO.ycp 41120 2007-09-26 19:17:08Z odabrunz $
*
*/
@@ -821,15 +821,18 @@
/**
* Read settings from disk
+ * @param reread boolean true to force reread settings from system
+ * @param avoid_reading_device_map do not read new device map from file, use
+ * internal data
* @return boolean true on success
*/
-global boolean Read (boolean reread) {
+global boolean Read (boolean reread, boolean avoid_reading_device_map) {
BootCommon::InitializeLibrary (reread, "ppc");
if (reread) {
- BootCommon::ReadFiles ();
+ BootCommon::ReadFiles (avoid_reading_device_map);
}
- boolean ret = BootCommon::Read (false);
+ boolean ret = BootCommon::Read (false, avoid_reading_device_map);
y2milestone (":: Read globals: %1", BootCommon::globals);
importMetaData();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.28/src/modules/BootZIPL.ycp new/yast2-bootloader-2.15.29/src/modules/BootZIPL.ycp
--- old/yast2-bootloader-2.15.28/src/modules/BootZIPL.ycp 2007-08-31 12:05:43.000000000 +0200
+++ new/yast2-bootloader-2.15.29/src/modules/BootZIPL.ycp 2007-09-26 21:17:12.000000000 +0200
@@ -14,7 +14,7 @@
* Jiri Srain
* Philipp Thomas
*
- * $Id: BootZIPL.ycp 40623 2007-08-30 13:49:53Z pth $
+ * $Id: BootZIPL.ycp 41120 2007-09-26 19:17:08Z odabrunz $
*
*/
@@ -163,15 +163,17 @@
/**
* Read settings from disk
* @param reread boolean true to force reread settings from system
+ * @param avoid_reading_device_map do not read new device map from file, use
+ * internal data
* @return boolean true on success
*/
-global boolean Read (boolean reread) {
+global boolean Read (boolean reread, boolean avoid_reading_device_map) {
BootCommon::InitializeLibrary (reread, "zipl");
if (reread) {
- BootCommon::ReadFiles ();
+ BootCommon::ReadFiles (avoid_reading_device_map);
}
BootCommon::DetectDisks ();
- boolean ret = BootCommon::Read (false);
+ boolean ret = BootCommon::Read (false, avoid_reading_device_map);
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.28/src/routines/dialogs.ycp new/yast2-bootloader-2.15.29/src/routines/dialogs.ycp
--- old/yast2-bootloader-2.15.28/src/routines/dialogs.ycp 2006-05-29 12:12:44.000000000 +0200
+++ new/yast2-bootloader-2.15.29/src/routines/dialogs.ycp 2007-09-26 21:17:14.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: dialogs.ycp 31102 2006-05-22 16:54:46Z jplack $
+ * $Id: dialogs.ycp 41120 2007-09-26 19:17:08Z odabrunz $
*
*/
@@ -367,7 +367,7 @@
{
files[filename] = (string)UI::QueryWidget (`id (`file), `Value);
BootCommon::SetFilesContents (files);
- Bootloader::blRead (false);
+ Bootloader::blRead (false, false);
BootCommon::changed = true;
BootCommon::location_changed = true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.28/src/routines/lib_iface.ycp new/yast2-bootloader-2.15.29/src/routines/lib_iface.ycp
--- old/yast2-bootloader-2.15.28/src/routines/lib_iface.ycp 2007-02-26 18:43:44.000000000 +0100
+++ new/yast2-bootloader-2.15.29/src/routines/lib_iface.ycp 2007-09-26 21:17:14.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: lib_iface.ycp 36516 2007-02-26 17:43:40Z odabrunz $
+ * $Id: lib_iface.ycp 41120 2007-09-26 19:17:08Z odabrunz $
*
* WARNING:
* To be included to BootCommon.ycp only
@@ -284,11 +284,13 @@
/**
* Read the files from the system to internal cache of the library
+ * @param avoid_reading_device_map do not read the device map, but use internal
+ * data
* @return boolean true on success
*/
-global boolean ReadFiles () {
+global boolean ReadFiles (boolean avoid_reading_device_map) {
y2milestone ("Reading Files");
- boolean ret = System::Bootloader_API::readSettings ();
+ boolean ret = System::Bootloader_API::readSettings (avoid_reading_device_map);
if (! ret)
y2error ("Reading files failed");
return ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.28/src/routines/switcher.ycp new/yast2-bootloader-2.15.29/src/routines/switcher.ycp
--- old/yast2-bootloader-2.15.28/src/routines/switcher.ycp 2007-08-10 19:25:35.000000000 +0200
+++ new/yast2-bootloader-2.15.29/src/routines/switcher.ycp 2007-09-26 21:17:15.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: switcher.ycp 40210 2007-08-10 17:25:35Z odabrunz $
+ * $Id: switcher.ycp 41120 2007-09-26 19:17:08Z odabrunz $
*
*/
@@ -79,10 +79,10 @@
* @param reread boolean true to force rereading the settings from the disk
* @return boolean true on success
*/
-global define boolean blRead (boolean reread) ``{
+global define boolean blRead (boolean reread, boolean avoid_reading_device_map) ``{
map functions = getFunctions (BootCommon::getLoaderType (false));
- boolean(boolean) toEval = functions["read"]:BootCommon::Read;
- return toEval (reread);
+ boolean(boolean, boolean) toEval = functions["read"]:BootCommon::Read;
+ return toEval (reread, avoid_reading_device_map);
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.15.28/VERSION new/yast2-bootloader-2.15.29/VERSION
--- old/yast2-bootloader-2.15.28/VERSION 2007-09-25 13:53:13.000000000 +0200
+++ new/yast2-bootloader-2.15.29/VERSION 2007-09-26 21:22:50.000000000 +0200
@@ -1 +1 @@
-2.15.28
+2.15.29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org