diff --git a/bootloader_entry b/bootloader_entry index 89a2efa..fd2fc98 100644 --- a/bootloader_entry +++ b/bootloader_entry @@ -301,7 +301,7 @@ if [ -e $device_map ] ; then fi ) >> $logname -if [ `grep -c "^[^[:space:]]\+[[:space:]]\+/boot" /etc/fstab` -ne `grep -c "^[^[:space:]]\+[[:space:]]\+/boot" /etc/mtab` ]; then +if [ `grep -c "^[^#[:space:]]\+[[:space:]]\+/boot" /etc/fstab` -ne `grep -c "^[^[:space:]]\+[[:space:]]\+/boot" /etc/mtab` ]; then echo "/boot directory is not mounted"; exit 1; fi diff --git a/perl-Bootloader-0.4.72.tar.bz2 b/perl-Bootloader-0.4.72.tar.bz2 deleted file mode 100644 index 7cfa5e7..0000000 --- a/perl-Bootloader-0.4.72.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d37a1f5d664c728baf965d01baf0a8911fbd434e7259db51cebc34683d578a5b -size 55048 diff --git a/perl-Bootloader-0.4.73.tar.bz2 b/perl-Bootloader-0.4.73.tar.bz2 new file mode 100644 index 0000000..ed10a36 --- /dev/null +++ b/perl-Bootloader-0.4.73.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ae1eba109ff192643f15b999d304ccde577c2afd6d8889ee2b254cd1c3b12dd +size 55210 diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes index aa5a689..b1b83f1 100644 --- a/perl-Bootloader.changes +++ b/perl-Bootloader.changes @@ -1,7 +1,15 @@ ------------------------------------------------------------------- -Mon Sep 29 17:24:18 CEST 2008 - kukuk@suse.de +Tue Oct 7 14:51:05 CEST 2008 - jreidinger@suse.cz -- Fix syntax error in bootloader_entry [bnc#430666] +- Fix syntax error in bootloader_entry (bnc#430666 patch by + kukuk@suse.de) +- fix reading lilo configuration (needed to convert lilo to grub + FATE #305006) +- fix kernel/image mismatch (bnc #229978) +- add support for modulenounzip in xen section (bnc #397864) +- doesn't count commented boot entry in fstab (bnc #431535) +- don't fail if section is already removed (bnc #431535) +- 0.4.73 ------------------------------------------------------------------- Fri Sep 26 16:23:39 CEST 2008 - jreidinger@suse.cz diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec index 72ad4e3..235b975 100644 --- a/perl-Bootloader.spec +++ b/perl-Bootloader.spec @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.4.72) +# spec file for package perl-Bootloader (Version 0.4.73) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: perl-Bootloader -Version: 0.4.72 -Release: 2 +Version: 0.4.73 +Release: 1 Requires: perl-base = %{perl_version} Requires: e2fsprogs Recommends: perl-gettext @@ -74,8 +74,16 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader /usr/lib/bootloader %changelog -* Mon Sep 29 2008 kukuk@suse.de -- Fix syntax error in bootloader_entry [bnc#430666] +* Tue Oct 07 2008 jreidinger@suse.cz +- Fix syntax error in bootloader_entry (bnc#430666 patch by + kukuk@suse.de) +- fix reading lilo configuration (needed to convert lilo to grub + FATE #305006) +- fix kernel/image mismatch (bnc #229978) +- add support for modulenounzip in xen section (bnc #397864) +- doesn't count commented boot entry in fstab (bnc #431535) +- don't fail if section is already removed (bnc #431535) +- 0.4.73 * Fri Sep 26 2008 jreidinger@suse.cz - add password generator for grub (bnc #407887) - fix handling boolean parameters in powerLILO( bnc #383287) diff --git a/update-bootloader b/update-bootloader index dd057fa..90158fc 100644 --- a/update-bootloader +++ b/update-bootloader @@ -499,8 +499,6 @@ if (defined $oper{remove}) { open (LOG, ">>$logname"); print LOG ("update-bootloader: no $opt_image found\n"); close LOG; - - pod2usage("There is no section with image '$opt_image'"); } open (LOG, ">>$logname"); print LOG ("update-bootloader: finished operation remove\n");