summaryrefslogtreecommitdiffstats
path: root/perl-install/network/netconnect.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-12-29 12:16:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-12-29 12:16:30 +0000
commitbce59e8e1b55eb5ac91f30937a93aa290af40026 (patch)
treecb3f353ab8e94277f5d8efefafcbce1ba0ce686c /perl-install/network/netconnect.pm
parentae9b7c1acb33aacb50c8184a5588eeaf1b5b3399 (diff)
downloaddrakx-bce59e8e1b55eb5ac91f30937a93aa290af40026.tar
drakx-bce59e8e1b55eb5ac91f30937a93aa290af40026.tar.gz
drakx-bce59e8e1b55eb5ac91f30937a93aa290af40026.tar.bz2
drakx-bce59e8e1b55eb5ac91f30937a93aa290af40026.tar.xz
drakx-bce59e8e1b55eb5ac91f30937a93aa290af40026.zip
- do not use a global $in in network::modem, pass it as a parameter
- create network::modem::ppp_configure_raw() which doesn't need $in (it is only used by network::modem::ppp_configure(), but this is clearer that way)
Diffstat (limited to 'perl-install/network/netconnect.pm')
-rw-r--r--perl-install/network/netconnect.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 32a3c17c3..319e223ea 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -199,8 +199,8 @@ If you don't want to use the auto detection, deselect the checkbox.
}
) or goto step_1;
load_conf($netcnx, $netc, $intf);
- $conf{modem} and do { pre_func("modem"); require network::modem; network::modem::configure($netcnx, $mouse, $netc, $intf) or goto step_2 };
- $conf{winmodem} and do { pre_func("winmodem"); require network::modem; network::modem::winmodemConfigure($netc) or goto step_2 };
+ $conf{modem} and do { pre_func("modem"); require network::modem; network::modem::configure($in, $netcnx, $mouse, $netc, $intf) or goto step_2 };
+ $conf{winmodem} and do { pre_func("winmodem"); require network::modem; network::modem::winmodemConfigure($in, $netc) or goto step_2 };
$conf{isdn} and do { pre_func("isdn"); require network::isdn; network::isdn::configure($netcnx, $netc, $isdn) or goto step_2 };
$conf{adsl} and do { pre_func("adsl"); require network::adsl; network::adsl::configure($netcnx, $netc, $intf, $first_time) or goto step_2 };
$conf{cable} and do { pre_func("cable"); require network::ethernet; network::ethernet::configure_cable($netcnx, $netc, $intf, $first_time) or goto step_2; $netconnect::need_restart_network = 1 };