summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-09-08 14:24:11 +0000
committerOlivier Blin <oblin@mandriva.org>2005-09-08 14:24:11 +0000
commit634aa106f85b324beabb65e9d9edc9b0f36b2e7f (patch)
tree5ac34150a09db53bf9d6d28c170ed1896b78f557
parentfe79fd3343413824500097261ea7cb33881ddd21 (diff)
downloaddrakx-634aa106f85b324beabb65e9d9edc9b0f36b2e7f.tar
drakx-634aa106f85b324beabb65e9d9edc9b0f36b2e7f.tar.gz
drakx-634aa106f85b324beabb65e9d9edc9b0f36b2e7f.tar.bz2
drakx-634aa106f85b324beabb65e9d9edc9b0f36b2e7f.tar.xz
drakx-634aa106f85b324beabb65e9d9edc9b0f36b2e7f.zip
don't try to install both source/precompiled dkms packages if one of them is installed
-rw-r--r--perl-install/network/thirdparty.pm19
1 files changed, 13 insertions, 6 deletions
diff --git a/perl-install/network/thirdparty.pm b/perl-install/network/thirdparty.pm
index 816413164..e0fbc55fc 100644
--- a/perl-install/network/thirdparty.pm
+++ b/perl-install/network/thirdparty.pm
@@ -70,7 +70,9 @@ my %network_settings = (
description => 'HCF 56k Modem',
url => 'http://www.linuxant.com/drivers/hcf/',
name => 'hcfpcimodem',
- kernel_module => 1,
+ kernel_module => {
+ 'hcfpciengine',
+ },
tools =>
{
test_file => '/usr/sbin/hcfpciconfig',
@@ -84,7 +86,9 @@ my %network_settings = (
description => 'HSF 56k Modem',
url => 'http://www.linuxant.com/drivers/hsf/',
name => 'hsfmodem',
- kernel_module => 1,
+ kernel_module => {
+ 'hsfengine',
+ },
tools =>
{
test_file => '/usr/sbin/hsfconfig',
@@ -238,7 +242,9 @@ You can find a driver on http://eciadsl.flashtux.org/"),
description => 'Bewan Adsl (Unicorn)',
url => 'http://www.bewan.com/bewan/users/downloads/',
name => 'unicorn',
- kernel_module => 1,
+ kernel_module => {
+ test_file => 'unicorn_.*_atm',
+ },
tools => 1,
},
],
@@ -310,8 +316,9 @@ sub is_file_installed {
}
sub is_module_installed {
- my ($driver) = @_;
- find { m!/\Q$driver\E\.k?o! } cat_("$::prefix/lib/modules/" . c::kernel_version() . '/modules.dep');
+ my ($settings, $driver) = @_;
+ my $module = $settings->{kernel_module}{test_file} || $driver;
+ find { m!/$driver\.k?o! } cat_("$::prefix/lib/modules/" . c::kernel_version() . '/modules.dep');
}
sub is_firmware_installed {
@@ -403,7 +410,7 @@ sub install_packages {
kernel_module =>
{
find_package_name => sub { device_get_package($settings, $option, "$settings->{name}-kernel") },
- check_installed => sub { is_module_installed($driver) },
+ check_installed => sub { is_module_installed($settings, $driver) },
get_packages => sub { my ($name) = @_; my $l = $in->do_pkgs->check_kernel_module_packages($name); $l ? @$l : () }
},
firmware =>