From f5fbfe686c7e5856e63eb40b994ea709410869c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= Date: Thu, 17 Mar 2005 15:54:46 +0000 Subject: MERGE: don't be so i586-centric --- kernel/update_kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel') diff --git a/kernel/update_kernel b/kernel/update_kernel index 3d14be186..f143f4740 100755 --- a/kernel/update_kernel +++ b/kernel/update_kernel @@ -37,7 +37,7 @@ sub rpm2version { sub update_kernel_from_repository { my ($RPMS, $main_ver, $is_BOOT) = @_; - my $rpm_wildcard = 'kernel-' . ($is_BOOT ? 'BOOT-' : 'i586-up-1GB-') . $main_ver . '*.rpm'; + my $rpm_wildcard = 'kernel-' . ($is_BOOT ? 'BOOT-' : (arch() =~ /i.86/ ? 'i586-up-1GB-' : '')) . $main_ver . '*.rpm'; my ($kernel_rpm) = my @kernels = glob("$RPMS/$rpm_wildcard"); @kernels <= 1 or die "more than one kernel match $rpm_wildcard"; @kernels >= 1 or return; # die "no kernel match $rpm_wildcard"; -- cgit v1.2.1