diff --git a/bootloader_entry b/bootloader_entry index fd2fc98..59dde00 100644 --- a/bootloader_entry +++ b/bootloader_entry @@ -301,7 +301,8 @@ 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[[:space:]]" /etc/fstab` -ne \ + `grep -c "^[^[:space:]]\+[[:space:]]\+/boot[[:space:]]" /etc/mtab` ]; then echo "/boot directory is not mounted"; exit 1; fi diff --git a/perl-Bootloader-0.4.73.tar.bz2 b/perl-Bootloader-0.4.73.tar.bz2 deleted file mode 100644 index ed10a36..0000000 --- a/perl-Bootloader-0.4.73.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ae1eba109ff192643f15b999d304ccde577c2afd6d8889ee2b254cd1c3b12dd -size 55210 diff --git a/perl-Bootloader-0.4.74.tar.bz2 b/perl-Bootloader-0.4.74.tar.bz2 new file mode 100644 index 0000000..72f024a --- /dev/null +++ b/perl-Bootloader-0.4.74.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2177a6ee31727b71eccca04166a142536a6e29d0961fe16ef8def61a42f9cbdd +size 55621 diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes index b1b83f1..0711935 100644 --- a/perl-Bootloader.changes +++ b/perl-Bootloader.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Oct 9 15:34:48 CEST 2008 - jreidinger@suse.cz + +- use option relocatable only on ia64 architecture (FATE #301882) +- improve selecting root devices (bnc #433347) +- fix regex to confirm mounted /boot (bnc #433835) +- add support for xen to elilo, as elilo now must work also on + x86_64 (FATE #301882) +- 0.4.74 + ------------------------------------------------------------------- Tue Oct 7 14:51:05 CEST 2008 - jreidinger@suse.cz diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec index 235b975..a7512d3 100644 --- a/perl-Bootloader.spec +++ b/perl-Bootloader.spec @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.4.73) +# spec file for package perl-Bootloader (Version 0.4.74) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: perl-Bootloader -Version: 0.4.73 +Version: 0.4.74 Release: 1 Requires: perl-base = %{perl_version} Requires: e2fsprogs @@ -74,6 +74,13 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader /usr/lib/bootloader %changelog +* Thu Oct 09 2008 jreidinger@suse.cz +- use option relocatable only on ia64 architecture (FATE #301882) +- improve selecting root devices (bnc #433347) +- fix regex to confirm mounted /boot (bnc #433835) +- add support for xen to elilo, as elilo now must work also on + x86_64 (FATE #301882) +- 0.4.74 * Tue Oct 07 2008 jreidinger@suse.cz - Fix syntax error in bootloader_entry (bnc#430666 patch by kukuk@suse.de) diff --git a/update-bootloader b/update-bootloader index 90158fc..85e8d0a 100644 --- a/update-bootloader +++ b/update-bootloader @@ -344,8 +344,8 @@ if (defined $oper{add}) { $opt_xen_name = "$opt_name -- " . GetProduct() . " - " . $version; } else { - $opt_name =~ s/^.*(xen.*)$/$1/; - $opt_name = ucfirst ($opt_name); + $opt_xen_name =~ s/^.*(xen.*)$/$1/; + $opt_xen_name = ucfirst ($opt_xen_name); } } # Naming scheme for all other kernels @@ -376,6 +376,7 @@ if (defined $oper{add}) { if (defined $oper{add}) { open (LOG, ">>$logname"); print LOG ("update-bootloader: now executing operation add\n"); + print LOG ("update-bootloader: changed opt name is $opt_name \n"); close LOG; pod2usage("Please specify name and kernel image for new section")