From a0d98620fca280b3b27250beb5c5effa78c0ded6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 19 Mar 2012 18:56:29 +0000 Subject: simplify horrible code I let ARM maintainer decides if the following is better: $image = find { -e $_ } map { "/boot/$_-$kernel_version" } if_(arch() =~ /arm/ && $kernel_version =~ /versatile/, 'uImage'), qw(vmlinux vmlinuz); --- perl-install/standalone/bootloader-config | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'perl-install') diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config index 99bc5409e..6af70b48d 100755 --- a/perl-install/standalone/bootloader-config +++ b/perl-install/standalone/bootloader-config @@ -54,19 +54,7 @@ if ($image) { } $image = "/boot/$image" if $image !~ m!^/!; } elsif ($kernel_version) { - # FIXME : test for vmlinux or vmlinuz existence and choose - # instead of using arch() - if (arch() =~ /mips/) { - $image = "/boot/vmlinux-$kernel_version"; - } elsif (arch() =~ /arm/) { - if ($kernel_version =~ /versatile/) { - $image = "/boot/vmlinuz-$kernel_version"; - } else { - $image = "/boot/uImage-$kernel_version"; - } - } else { - $image = "/boot/vmlinuz-$kernel_version"; - } + $image = find { -e $_ } map { "/boot/$_-$kernel_version" } qw(vmlinux uImage vmlinuz); } -- cgit v1.2.1