diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-12-07 11:34:46 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-12-07 11:34:46 +0000 |
| commit | 1acc01d887d78cdb491dcc6a6e9b3a09422bce60 (patch) | |
| tree | 581227cffa9fa5468b1d179851853f0e1446f5ca | |
| parent | 629250278eb55d7357e0a9eef898ac84766f762e (diff) | |
| download | drakx-1acc01d887d78cdb491dcc6a6e9b3a09422bce60.tar drakx-1acc01d887d78cdb491dcc6a6e9b3a09422bce60.tar.gz drakx-1acc01d887d78cdb491dcc6a6e9b3a09422bce60.tar.bz2 drakx-1acc01d887d78cdb491dcc6a6e9b3a09422bce60.tar.xz drakx-1acc01d887d78cdb491dcc6a6e9b3a09422bce60.zip | |
(read_grub_menu_lst) kill a very old perl_checker warning
warning introduced in commit r256501 by pterjan on Apr 15 2009:
"keep grub entries which refer to unknown devices verbatim instead of
crashing (#48728)"
| -rw-r--r-- | perl-install/bootloader.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index d791f97ad..0d79777d5 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -384,7 +384,7 @@ sub read_grub_menu_lst { $e->{append} = join(' ', grep { !/^BOOT_IMAGE=/ } split(' ', $e->{append})); $e->{root} = $1 if $e->{append} =~ s/root=(\S*)\s*//; eval { $e->{kernel_or_dev} = grub2file($kernel, $grub2dev, $fstab, $e) }; - $e->{keep_verbatim} = 1 unless $e->{kernel_or_dev} && dirname($e->{kernel_or_dev}) eq '/boot'; + $e->{keep_verbatim} = 1 if !$e->{kernel_or_dev} || dirname($e->{kernel_or_dev}) ne '/boot'; } my ($vga, $other) = partition { /^vga=/ } split(' ', $e->{append}); if (@$vga) { |