From 5604997f13654d4ba9b361e7039f81dda73f30b3 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Thu, 4 Oct 2007 16:40:31 +0000 Subject: when checking dkms module packages, check that modules are either available in urpmi media, or already installed (fix detection in live) --- perl-install/do_pkgs.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'perl-install/do_pkgs.pm') diff --git a/perl-install/do_pkgs.pm b/perl-install/do_pkgs.pm index 6bed053d8..a660954c7 100644 --- a/perl-install/do_pkgs.pm +++ b/perl-install/do_pkgs.pm @@ -91,11 +91,13 @@ sub check_kernel_module_packages { my ($do, $base_name) = @_; require bootloader; - my @rpms = ( + my @test_rpms = ( 'dkms-' . $base_name, map { $base_name . '-kernel-' . bootloader::vmlinuz2version($_) } bootloader::installed_vmlinuz() ); - @rpms = $do->are_available(@rpms) or return; + @rpms = $do->are_available(@test_rpms); + @rpms = $do->are_installed(@test_rpms) if !@rpms; + @rpms or return; log::l("those kernel module packages can be installed: " . join(' ', @rpms)); -- cgit v1.2.1