From c3c3c9c4e45b26a4691bcbaa0f0c0a91af1296a2f9b35d18e5f0ac847a2a2302 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 23 Aug 2007 23:55:26 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/perl-Bootloader?expand=0&rev=23 --- bootloader_entry | 12 ++++++------ perl-Bootloader-0.4.23.tar.bz2 | 4 ++-- perl-Bootloader.changes | 13 +++++++++++++ perl-Bootloader.spec | 9 ++++++++- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/bootloader_entry b/bootloader_entry index fa38b34..cd9de46 100644 --- a/bootloader_entry +++ b/bootloader_entry @@ -68,12 +68,12 @@ function update_bootloader() function add_entry() { # Set up the new kernel - #if [ "$YAST_IS_RUNNING" != instsys ]; then - if [ -f /boot/grub/menu.lst -o \ - -f /etc/lilo.conf -o \ - -f /etc/elilo.conf -o \ - -f /etc/zipl.conf ]; then - case $flavor in + if [ -f /etc/sysconfig/bootloader ] && + [ -f /boot/grub/menu.lst -o \ + -f /etc/lilo.conf -o \ + -f /etc/elilo.conf -o \ + -f /etc/zipl.conf ]; then + case $flavor in (kdump|um) ;; (xen*) diff --git a/perl-Bootloader-0.4.23.tar.bz2 b/perl-Bootloader-0.4.23.tar.bz2 index 18de4b8..c3be17b 100644 --- a/perl-Bootloader-0.4.23.tar.bz2 +++ b/perl-Bootloader-0.4.23.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dea5c2264822676b0d52ba4f23182b8b7945bacf6c66af7354dc67ff7bfdc382 -size 48291 +oid sha256:c15e7a25188213ed7b2a9013c911859a9f3ac12e1065a8d4209ef31e3a0ac1ce +size 48342 diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes index f1bf3a0..3eab441 100644 --- a/perl-Bootloader.changes +++ b/perl-Bootloader.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Aug 23 12:48:58 CEST 2007 - aosthof@suse.de + +- Added check for /etc/sysconfig/bootloader in bootloader_entry + preventing installation errors in case of shared boot partitions + (#303734) + +------------------------------------------------------------------- +Wed Aug 22 15:16:33 CEST 2007 - aosthof@suse.de + +- Check for defined types in GRUB.pm to prevent perl warnings + (#302174) + ------------------------------------------------------------------- Tue Aug 21 18:16:41 CEST 2007 - aosthof@suse.de diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec index cc2ec9d..c119522 100644 --- a/perl-Bootloader.spec +++ b/perl-Bootloader.spec @@ -12,7 +12,7 @@ Name: perl-Bootloader Version: 0.4.23 -Release: 3 +Release: 5 Requires: perl >= %{perl_version} Requires: perl-gettext Requires: e2fsprogs @@ -66,6 +66,13 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader /usr/lib/bootloader %changelog +* Thu Aug 23 2007 - aosthof@suse.de +- Added check for /etc/sysconfig/bootloader in bootloader_entry + preventing installation errors in case of shared boot partitions + (#303734) +* Wed Aug 22 2007 - aosthof@suse.de +- Check for defined types in GRUB.pm to prevent perl warnings + (#302174) * Tue Aug 21 2007 - aosthof@suse.de - Check for defined keys in GRUB.pm to prevent perl warnings (#302174)