From 1acc01d887d78cdb491dcc6a6e9b3a09422bce60 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 7 Dec 2012 11:34:46 +0000 Subject: (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)" --- perl-install/bootloader.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { -- cgit v1.2.1