From 43e39fd00a2ff8772470c6e0d64b7fb14f4fea4bbf5eda07021e5bb295f98197 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 14 Feb 2007 19:54:31 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/perl-Bootloader?expand=0&rev=3 --- bootloader_entry | 25 +++++++++++------ perl-Bootloader-0.4.11.tar.bz2 | 3 ++ perl-Bootloader-0.4.8.tar.bz2 | 3 -- perl-Bootloader.changes | 51 ++++++++++++++++++++++++++++++++++ perl-Bootloader.spec | 33 ++++++++++++++++++++-- 5 files changed, 100 insertions(+), 15 deletions(-) create mode 100644 perl-Bootloader-0.4.11.tar.bz2 delete mode 100644 perl-Bootloader-0.4.8.tar.bz2 diff --git a/bootloader_entry b/bootloader_entry index 7b59e15..20e6896 100644 --- a/bootloader_entry +++ b/bootloader_entry @@ -72,22 +72,29 @@ function add_entry() case $flavor in (kdump|um) ;; - (*) + (xen*) opt_xen_kernel= - case $flavor in - xen*) - set -- $flavor - set -- ${1#xen} - opt_xen_kernel=--xen-kernel=/boot/xen${1:+-$1}.gz - ;; - esac + set -- $flavor + set -- ${1#xen} + opt_xen_kernel=--xen-kernel=/boot/xen${1:+-$1}.gz + # Add the new bootloader entry + update_bootloader --image /boot/$image \ + --initrd /boot/$initrd \ + --add \ + --force $opt_xen_kernel \ + --name "Kernel-$release" + + # Run the bootloader (e.g., lilo). + update_bootloader --refresh + ;; + (*) # Add the new bootloader entry update_bootloader --image /boot/$image \ --initrd /boot/$initrd \ --default \ --add \ - --force $opt_xen_kernel \ + --force \ --name "Kernel-$release" # Run the bootloader (e.g., lilo). diff --git a/perl-Bootloader-0.4.11.tar.bz2 b/perl-Bootloader-0.4.11.tar.bz2 new file mode 100644 index 0000000..46b44a4 --- /dev/null +++ b/perl-Bootloader-0.4.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:366ade095b23f7660b6206ce140c117dff50a10f0992a6446cb8fe9675376782 +size 40147 diff --git a/perl-Bootloader-0.4.8.tar.bz2 b/perl-Bootloader-0.4.8.tar.bz2 deleted file mode 100644 index 52d9b6f..0000000 --- a/perl-Bootloader-0.4.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:598d269e9f034ca533f8426d9e5f589d4159bb31106951d2ac2940aaf01313ca -size 39942 diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes index 811eb05..f46274b 100644 --- a/perl-Bootloader.changes +++ b/perl-Bootloader.changes @@ -1,3 +1,54 @@ +------------------------------------------------------------------- +Wed Feb 14 11:51:49 CET 2007 - aosthof@suse.de + +- manually merge SLES10 branch with trunk, part 4/4: +- fixed function SplitDevPath() in src/Core.pm to avoid an endless + loop (#228570) & (#236777) +- version bump 0.4.11 (skipped 0.4.10 to be consistent again) + +------------------------------------------------------------------- +Wed Feb 14 11:44:14 CET 2007 - aosthof@suse.de + +- manually merge SLES10 branch with trunk, part 3/4: +- Reverted to make Xen kernel default boot kernel if Xen pattern + or Xen RPMs are installed. (Fate #301384) + +------------------------------------------------------------------- +Wed Feb 14 11:40:20 CET 2007 - aosthof@suse.de + +- manually merge SLES10 branch with trunk, part 2/4: +- fixed function InitializeBootloader() in src/Core/ZIPL.pm to + correctly call /sbin/zipl (without param "-m menu") (#199582) + +------------------------------------------------------------------- +Wed Feb 14 11:31:30 CET 2007 - aosthof@suse.de + +- manually merge SLES10 branch with trunk, part 1/4: +- fixed default/minimum/maximum values for timeout in ELILO.pm +- fixed some typos (in descriptions) in ELILO.pm +- IA 64: Added missing options in elilo.conf (#235400) + +------------------------------------------------------------------- +Wed Jan 17 12:37:41 CET 2007 - jplack@suse.de + +- fix for efi boot entry handling (#233537) + +------------------------------------------------------------------- +Wed Jan 17 12:21:02 CET 2007 - jplack@suse.de + +- proposed fix for append quotation in elilo (#235400) + +------------------------------------------------------------------- +Tue Jan 16 23:46:31 CET 2007 - jplack@suse.de + +- fix various zipl configuration problems (#235486) + +------------------------------------------------------------------- +Thu Jan 11 16:16:36 CET 2007 - jplack@suse.de + +- final (at least should be ) fix for ELILO (#228833) +- version bump 0.4.9 + ------------------------------------------------------------------- Wed Jan 10 18:12:52 CET 2007 - jplack@suse.de diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec index 8a82fab..481c902 100644 --- a/perl-Bootloader.spec +++ b/perl-Bootloader.spec @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.4.8) +# spec file for package perl-Bootloader (Version 0.4.11) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,8 +11,8 @@ # norootforbuild Name: perl-Bootloader -Version: 0.4.8 -Release: 2 +Version: 0.4.11 +Release: 1 Requires: perl >= %{perl_version} Requires: perl-gettext Requires: mdadm e2fsprogs @@ -63,6 +63,33 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader /usr/lib/bootloader %changelog -n perl-Bootloader +* Wed Feb 14 2007 - aosthof@suse.de +- manually merge SLES10 branch with trunk, part 4/4: +- fixed function SplitDevPath() in src/Core.pm to avoid an endless + loop (#228570) & (#236777) +- version bump 0.4.11 (skipped 0.4.10 to be consistent again) +* Wed Feb 14 2007 - aosthof@suse.de +- manually merge SLES10 branch with trunk, part 3/4: +- Reverted to make Xen kernel default boot kernel if Xen pattern + or Xen RPMs are installed. (Fate #301384) +* Wed Feb 14 2007 - aosthof@suse.de +- manually merge SLES10 branch with trunk, part 2/4: +- fixed function InitializeBootloader() in src/Core/ZIPL.pm to + correctly call /sbin/zipl (without param "-m menu") (#199582) +* Wed Feb 14 2007 - aosthof@suse.de +- manually merge SLES10 branch with trunk, part 1/4: +- fixed default/minimum/maximum values for timeout in ELILO.pm +- fixed some typos (in descriptions) in ELILO.pm +- IA 64: Added missing options in elilo.conf (#235400) +* Wed Jan 17 2007 - jplack@suse.de +- fix for efi boot entry handling (#233537) +* Wed Jan 17 2007 - jplack@suse.de +- proposed fix for append quotation in elilo (#235400) +* Tue Jan 16 2007 - jplack@suse.de +- fix various zipl configuration problems (#235486) +* Thu Jan 11 2007 - jplack@suse.de +- final (at least should be ) fix for ELILO (#228833) +- version bump 0.4.9 * Wed Jan 10 2007 - jplack@suse.de - mostly complete fix for #228833, wrong elilo configurator * Fri Dec 22 2006 - aosthof@suse.de