diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-07-21 09:35:44 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-07-21 09:35:44 +0000 |
| commit | 3507800100da6fde08167f34d6e685fbe36e2948 (patch) | |
| tree | b9893f4be82dfa52db8f6e079745dee84a48064d /perl-install/network/netconnect.pm | |
| parent | a2fc2a36a5261bca7eacfeb8e5deba4905e98f06 (diff) | |
| download | drakx-3507800100da6fde08167f34d6e685fbe36e2948.tar drakx-3507800100da6fde08167f34d6e685fbe36e2948.tar.gz drakx-3507800100da6fde08167f34d6e685fbe36e2948.tar.bz2 drakx-3507800100da6fde08167f34d6e685fbe36e2948.tar.xz drakx-3507800100da6fde08167f34d6e685fbe36e2948.zip | |
don't use global $in (fix ISDN configuration)
Diffstat (limited to 'perl-install/network/netconnect.pm')
| -rw-r--r-- | perl-install/network/netconnect.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 059b9e1ec..41db9df62 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -302,7 +302,7 @@ sub real_main { ]; }, post => sub { - network::isdn::write_config($isdn); + network::isdn::write_config($in, $isdn); $net->{net_interface} = 'ippp0'; "allow_user_ctl"; }, @@ -366,7 +366,7 @@ sub real_main { $isdn->{driver} = $isdn_cards{$isdn_name}{driver}; #- do not let config overwrite default 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"; + $isdn->{driver} ne "capidrv" && network::isdn::get_capi_card($in, $isdn) and return "isdn_driver"; return "isdn_protocol"; }, }, @@ -652,7 +652,7 @@ Take a look at http://www.linmodems.org"), detect($modules_conf, $net->{autodetect}, 'isdn'); if (my @isdn_modems = @{$net->{autodetect}{isdn}}) { require network::isdn; - %isdn_cards = map { $_->{description} => $_ } grep { $_->{driver} =~ /dsl/i } map { network::isdn::get_capi_card($_) } @isdn_modems; + %isdn_cards = map { $_->{description} => $_ } grep { $_->{driver} =~ /dsl/i } map { network::isdn::get_capi_card($in, $_) } @isdn_modems; push @adsl_devices, keys %isdn_cards; } }, |