diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-17 09:33:17 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-17 09:33:17 +0000 |
| commit | c6022ccdaa53d5a35ecdcce0e33da825e186611c (patch) | |
| tree | 7e22c37cc48d91f9668fc1f9fdc5726039f4945c | |
| parent | efce46c491c5efca8fdea5083b0382841c44b32e (diff) | |
| download | drakx-c6022ccdaa53d5a35ecdcce0e33da825e186611c.tar drakx-c6022ccdaa53d5a35ecdcce0e33da825e186611c.tar.gz drakx-c6022ccdaa53d5a35ecdcce0e33da825e186611c.tar.bz2 drakx-c6022ccdaa53d5a35ecdcce0e33da825e186611c.tar.xz drakx-c6022ccdaa53d5a35ecdcce0e33da825e186611c.zip | |
- bootloader-config:
o --rebuild-initrds: don't choke on kernel files which have no version in
file name (#28772)
(thanks to anssi)
| -rw-r--r-- | perl-install/NEWS | 4 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 3479de99b..c0e164210 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,7 @@ +- bootloader-config: + o --rebuild-initrds: don't choke on kernel files which have no version in + file name (#28772) + Version 10.4.198 - 16 September 2007, by Thierry Vignaud - fix a crash diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 60e473e86..decb3a1d0 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -663,7 +663,7 @@ sub rebuild_initrds { my %done; foreach my $v (grep { $_->{initrd} } @{$bootloader->{entries}}) { - my $kernel_str = vmlinuz2kernel_str($v->{kernel_or_dev}); + my $kernel_str = vmlinuz2kernel_str($v->{kernel_or_dev}) or next; my $initrd_long = '/boot/' . kernel_str2initrd_long($kernel_str); next if $done{$initrd_long}++; |