Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Fri Nov 7 16:04:57 CET 2008.
--------
--- yast2-bootloader/yast2-bootloader.changes 2008-11-03 14:40:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-11-07 15:54:44.110348000 +0100
@@ -1,0 +2,9 @@
+Fri Nov 7 10:29:26 CET 2008 - juhliarik@suse.cz
+
+- added fix for writing crashkernel to bootloader from kdump on ppc
+ (bnc #441547)
+- added fix for double boot entry twice by efibootmgr (bnc #438215)
+- added fix for using fix_chs (bnc #367304)
+- 2.17.36
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-bootloader-2.17.35.tar.bz2
New:
----
yast2-bootloader-2.17.36.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.Nk4378/_old 2008-11-07 16:04:42.000000000 +0100
+++ /var/tmp/diff_new_pack.Nk4378/_new 2008-11-07 16:04:42.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.17.35)
+# spec file for package yast2-bootloader (Version 2.17.36)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-bootloader
-Version: 2.17.35
+Version: 2.17.36
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.17.35.tar.bz2
+Source0: yast2-bootloader-2.17.36.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:
@@ -64,7 +64,7 @@
Daniel Fiser
%prep
-%setup -n yast2-bootloader-2.17.35
+%setup -n yast2-bootloader-2.17.36
%build
%{prefix}/bin/y2tool y2autoconf
@@ -111,6 +111,12 @@
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Fri Nov 07 2008 juhliarik@suse.cz
+- added fix for writing crashkernel to bootloader from kdump on ppc
+ (bnc #441547)
+- added fix for double boot entry twice by efibootmgr (bnc #438215)
+- added fix for using fix_chs (bnc #367304)
+- 2.17.36
* Fri Oct 31 2008 juhliarik@suse.cz
- added better proposal checking elilo ,lilo
- added fix for typo (bnc #439030)
@@ -509,7 +515,7 @@
- creating "image" section instead of "kernel" section now in
CreateLinuxSection()
- 2.15.11
-* Wed Jul 11 2007 od@suse.de
+* Tue Jul 10 2007 od@suse.de
- Merge from SLES10-SP1 branch:
- let "SLES 9 style" autoyast xml files configure bootloader
timeout (#214468, #183051)
@@ -657,7 +663,7 @@
- for bootloaders that still use the old style variables, check
for undefined loader_device before comparing to floppy device
- 2.15.10
-* Sat Jul 07 2007 od@suse.de
+* Fri Jul 06 2007 od@suse.de
- Remove limal-devel from BuildRequires again
- 2.15.9
* Wed Jul 04 2007 aj@suse.de
@@ -702,7 +708,7 @@
- 2.15.4
* Wed Jan 17 2007 jplack@suse.de
- revise efi boot manager entry handling (#233537)
-* Wed Jan 17 2007 jplack@suse.de
+* Tue Jan 16 2007 jplack@suse.de
- fix various zipl configuration problems (#235486)
* Mon Jan 15 2007 jplack@suse.de
- more stream lining in help messages
@@ -906,7 +912,7 @@
- 2.13.82
* Tue Oct 31 2006 od@suse.de
- fixed exporting the device map to autoyast (#211908)
-* Tue Oct 17 2006 od@suse.de
+* Mon Oct 16 2006 od@suse.de
- packaged missing grub/help.ycp and generic/help.ycp
- added comments to UpdateGfxMenuContents()
- 2.13.80
@@ -1152,7 +1158,7 @@
- reorder code so that new function SetDiskInfo is formed and can
be used in various places to fix #161755
- add proposed code change for virtual 'boot' mountpoints (#162242)
-* Sun Apr 02 2006 od@suse.de
+* Sat Apr 01 2006 od@suse.de
- added TESTME comment: test parted partition activation with BSD
slices
- remove more old-style backticks
@@ -1182,7 +1188,7 @@
- fixed #157939: iseries can boot even if no prep boot partition
exists and/or is configured
- 2.13.31
-* Tue Mar 21 2006 od@suse.de
+* Mon Mar 20 2006 od@suse.de
- package clients/print-product.ycp
- 2.13.30
* Mon Mar 20 2006 od@suse.de
@@ -1201,7 +1207,7 @@
- fix indentation/code style
- print-product.ycp was wrong in modules, moved to clients
- 2.13.28
-* Sat Mar 18 2006 od@suse.de
+* Fri Mar 17 2006 od@suse.de
- made text widget in error log message popup higher (#159264)
- fix indentation
- 2.13.27
@@ -1916,7 +1922,7 @@
installation (#35566)
* Wed Apr 07 2004 sh@suse.de
- Fixed excessive whitespace after Module:: - bug #38327
-* Wed Apr 07 2004 schwab@suse.de
+* Tue Apr 06 2004 schwab@suse.de
- Add nohalt to failsafe kernel command line on ia64.
* Tue Apr 06 2004 jsrain@suse.de
- updating graphical boot menu to contain proper languages (and
@@ -2145,7 +2151,7 @@
* Fri Sep 19 2003 jsrain@suse.de
- fixed testsuite (again)
- 2.8.21
-* Fri Sep 19 2003 nashif@suse.de
+* Thu Sep 18 2003 nashif@suse.de
- Fixed testsuite
- 2.8.20
* Thu Sep 18 2003 jsrain@suse.de
++++++ yast2-bootloader-2.17.35.tar.bz2 -> yast2-bootloader-2.17.36.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.35/src/grub/misc.ycp new/yast2-bootloader-2.17.36/src/grub/misc.ycp
--- old/yast2-bootloader-2.17.35/src/grub/misc.ycp 2008-10-27 13:22:52.000000000 +0100
+++ new/yast2-bootloader-2.17.36/src/grub/misc.ycp 2008-11-07 10:33:34.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: misc.ycp 52575 2008-10-27 12:22:51Z juhliarik $
+ * $Id: misc.ycp 53034 2008-11-07 09:33:33Z juhliarik $
*
*/
@@ -401,14 +401,6 @@
integer exit = out["exit"]:0;
y2milestone ("Command output: %1", out);
ret = ret && (0 == exit);
- command = sformat ("/usr/sbin/fix_chs %1 %2",
- mbr_dev,
- num);
- y2milestone ("Running command %1", command);
- out = (map)SCR::Execute (.target.bash_output, command);
- exit = out["exit"]:0;
- y2milestone ("Command output: %1", out);
- ret = ret && (0 == exit);
}
}
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.35/src/modules/BootELILO.ycp new/yast2-bootloader-2.17.36/src/modules/BootELILO.ycp
--- old/yast2-bootloader-2.17.35/src/modules/BootELILO.ycp 2008-10-27 10:29:22.000000000 +0100
+++ new/yast2-bootloader-2.17.36/src/modules/BootELILO.ycp 2008-11-07 10:33:34.000000000 +0100
@@ -17,7 +17,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootELILO.ycp 52557 2008-10-27 09:29:22Z juhliarik $
+ * $Id: BootELILO.ycp 53034 2008-11-07 09:33:33Z juhliarik $
*
*/
@@ -490,7 +490,22 @@
"--loader '\\efi\\SuSE\\elilo.efi' --write-signature >> %4 2>&1",
BootCommon::globals["boot_efilabel"]:"", boot_disk, boot_part, bl_logfile
);
- ret = ret && installBootLoader (bl_command, bl_logfile);
+
+ // command for checking same boot entry in efi bnc #438215 (YaST creates efibootloader entry twice)
+ string cmd = sformat("/usr/sbin/efibootmgr -v | grep -c \"%1.*HD(%2.*File(.\\efi.\\SuSE.\\elilo.efi)\"",
+ BootCommon::globals["boot_efilabel"]:"", boot_part);
+ y2milestone("Command for checking same boot entry: %1", cmd);
+
+ // check how many entries with same label and partition is actually in efi
+ map out = (map)SCR::Execute (.target.bash_output, cmd);
+
+ // check number of same boot entries in efi
+ // if boot entry is added -> don't add it again
+ if (deletechars(out["stdout"]:"","\n") == "0")
+ ret = ret && installBootLoader (bl_command, bl_logfile);
+ else
+ y2milestone("Skip adding boot entry: %1 to EFI. There already exist: %2 with same label and partition.",
+ BootCommon::globals["boot_efilabel"]:"", deletechars(out["stdout"]:"","\n"));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.35/src/modules/Bootloader.ycp new/yast2-bootloader-2.17.36/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.17.35/src/modules/Bootloader.ycp 2008-10-31 12:49:06.000000000 +0100
+++ new/yast2-bootloader-2.17.36/src/modules/Bootloader.ycp 2008-11-07 10:33:34.000000000 +0100
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: Bootloader.ycp 52785 2008-10-31 11:49:05Z juhliarik $
+ * $Id: Bootloader.ycp 53034 2008-11-07 09:33:33Z juhliarik $
*
*/
@@ -41,6 +41,7 @@
import "BootPOWERLILO"; // The ppc-LILO File
//fate 303395
import "ProductFeatures";
+ import "Arch";
// interface for clients
global define map Export ();
@@ -1407,6 +1408,14 @@
return true;
}
+ // check architecture for using kexec instead of reboot
+ if (Arch::ppc() || Arch::ia64() || Arch::s390())
+ {
+ y2milestone("Skip using of kexec on this architecture");
+ 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);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.35/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.17.36/src/modules/BootPOWERLILO.ycp
--- old/yast2-bootloader-2.17.35/src/modules/BootPOWERLILO.ycp 2008-10-23 14:27:47.000000000 +0200
+++ new/yast2-bootloader-2.17.36/src/modules/BootPOWERLILO.ycp 2008-11-07 10:33:34.000000000 +0100
@@ -16,7 +16,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootPOWERLILO.ycp 52457 2008-10-23 12:27:46Z juhliarik $
+ * $Id: BootPOWERLILO.ycp 53034 2008-11-07 09:33:33Z juhliarik $
*
*/
@@ -875,22 +875,25 @@
BootCommon::UpdateAppend ();
}
+ // check if there is selected "none" bootloader
+ string bl = BootCommon::getLoaderType (false);
+
+ if (bl == "none")
+ {
+ BootCommon::InitializeLibrary (init, bl);
+ return true;
+ }
+
if (! BootCommon::InitializeLibrary (init, "ppc"))
// send current disk/partition information to perl-Bootloader
BootCommon::SetDiskInfo ();
- // Sanity check the sections list: we can only pass strings
- // through the perl interface
- list