summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-09-16 04:13:11 +0000
committerOlivier Blin <oblin@mandriva.org>2004-09-16 04:13:11 +0000
commitb1628589377879b66b1671439df6dc5d54d058c2 (patch)
treeff61a238b79f135d9dcaa5f2f4f1234b60021e42
parent827e8d332ac71be90bbc67f6fc1625f9108bc34a (diff)
downloaddrakx-backup-do-not-use-b1628589377879b66b1671439df6dc5d54d058c2.tar
drakx-backup-do-not-use-b1628589377879b66b1671439df6dc5d54d058c2.tar.gz
drakx-backup-do-not-use-b1628589377879b66b1671439df6dc5d54d058c2.tar.bz2
drakx-backup-do-not-use-b1628589377879b66b1671439df6dc5d54d058c2.tar.xz
drakx-backup-do-not-use-b1628589377879b66b1671439df6dc5d54d058c2.zip
do not ask "capidrv or capidrv ?" ...
-rw-r--r--perl-install/network/netconnect.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index c00a12b41..dc74c06c5 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -360,7 +360,8 @@ sub real_main {
network::isdn::read_config($isdn);
$isdn->{driver} = $isdn_cards{$isdn_name}{driver}; #- do not let config overwrite default driver
- network::isdn::get_capi_card($isdn) and return "isdn_driver";
+ #- let the user choose hisax or capidrv if both are available
+ $isdn->{driver} ne "capidrv" && network::isdn::get_capi_card($isdn) and return "isdn_driver";
return "isdn_protocol";
},
},