diff options
author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2005-03-17 15:54:46 +0000 |
---|---|---|
committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2005-03-17 15:54:46 +0000 |
commit | f5fbfe686c7e5856e63eb40b994ea709410869c2 (patch) | |
tree | f8585c024a11cb12b965c83fba46655a68b623a5 /kernel | |
parent | f7fd2cc0a44b8bef643e51b9331b4382c408c29c (diff) | |
download | drakx-f5fbfe686c7e5856e63eb40b994ea709410869c2.tar drakx-f5fbfe686c7e5856e63eb40b994ea709410869c2.tar.gz drakx-f5fbfe686c7e5856e63eb40b994ea709410869c2.tar.bz2 drakx-f5fbfe686c7e5856e63eb40b994ea709410869c2.tar.xz drakx-f5fbfe686c7e5856e63eb40b994ea709410869c2.zip |
MERGE: don't be so i586-centric
Diffstat (limited to 'kernel')
-rwxr-xr-x | kernel/update_kernel | 2 |
1 files changed, 1 insertions, 1 deletions
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"; |