summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-09-14 09:42:53 +0000
committerOlivier Blin <oblin@mandriva.org>2004-09-14 09:42:53 +0000
commit614a9bb4d1141e4ed290506e288c8dc7288d996f (patch)
treef0f5d64f5edb3ab3429697579990d3c008b8faf0 /perl-install/network
parent5fbadc3563e77c0ff4e813c80380745a5074b9ba (diff)
downloaddrakx-614a9bb4d1141e4ed290506e288c8dc7288d996f.tar
drakx-614a9bb4d1141e4ed290506e288c8dc7288d996f.tar.gz
drakx-614a9bb4d1141e4ed290506e288c8dc7288d996f.tar.bz2
drakx-614a9bb4d1141e4ed290506e288c8dc7288d996f.tar.xz
drakx-614a9bb4d1141e4ed290506e288c8dc7288d996f.zip
adapt to kernel packages naming
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/isdn.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 41e3804a5..d6b5e960e 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -69,7 +69,7 @@ sub setup_capi_conf {
my ($capi_card) = @_;
$in->do_pkgs->ensure_is_installed('isdn4k-utils', "$::prefix/etc/rc.d/init.d/capi4linux"); #- capi4linux service
- is_module_installed($capi_card->{driver}) or $in->do_pkgs->install($capi_card->{driver});
+ is_module_installed($capi_card->{driver}) or $in->do_pkgs->install($capi_card->{packages});
if ($capi_card->{firmware} && ! -f "$::prefix/usr/lib/isdn/$capi_card->{firmware}") {
$in->do_pkgs->install("$capi_card->{driver}-firmware");
}
@@ -187,7 +187,7 @@ sub get_capi_card {
} @isdn_capi or return;
#- check if the capi driver is available
- unless (is_module_installed($capi_card->{driver}) || $in->do_pkgs->check_kernel_module_packages($capi_card->{driver})) {
+ unless (is_module_installed($capi_card->{driver}) || ($capi_card->{packages} = $in->do_pkgs->check_kernel_module_packages("$capi_card->{driver}-kernel"))) {
log::explanations("a capi driver ($capi_card->{driver}) exists to replace $isdn->{driver}, but it isn't installed and no packages provide it");
return;
}