summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/pkgs.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 2889fbee7..af8070597 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -175,7 +175,12 @@ sub packageById {
}
sub analyse_kernel_name {
- $_[0] =~ /kernel[^\-]*(-enterprise|-i686-up-4GB|-i586-up-1GB|-p3-smp-64GB|-secure|-smp|-multimedia|-multimedia-smp)?(?:-([^\-]+))?$/;
+ my $kernels = join('|', map { "-$_" }
+ '(p3|i586|i686)-(up|smp)-(1GB|4GB|64GB)',
+ qw(enterprise secure smp multimedia multimedia-smp),
+ );
+ my @l = $_[0] =~ /kernel[^\-]*($kernels)?(-([^\-]+))?$/ or return;
+ $l[0], $l[-1];
}
sub packages2kernels {