summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-08-04 06:47:29 +0000
committerOlivier Blin <oblin@mandriva.org>2004-08-04 06:47:29 +0000
commit6778ba679af2769845d8d837917c8b9e7dafa3e1 (patch)
treec2d407dc01d74eadc426e88e8b35833ba8bde33c
parent97495087142b69b51c6e4d5364656ffe888d87cb (diff)
downloaddrakx-6778ba679af2769845d8d837917c8b9e7dafa3e1.tar
drakx-6778ba679af2769845d8d837917c8b9e7dafa3e1.tar.gz
drakx-6778ba679af2769845d8d837917c8b9e7dafa3e1.tar.bz2
drakx-6778ba679af2769845d8d837917c8b9e7dafa3e1.tar.xz
drakx-6778ba679af2769845d8d837917c8b9e7dafa3e1.zip
write a cnx_script for adsl connexions too (so that drakconnect can
establish the connexion), add a FIXME comment to remind it is bad
-rw-r--r--perl-install/network/netconnect.pm5
1 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index d3aac8101..22069f39c 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -815,6 +815,10 @@ If you don't know, choose 'use pppoe'"),
post => sub {
$netc->{internet_cnx_choice} = 'adsl';
network::adsl::adsl_conf_backend($in, $modules_conf, $netcnx, $netc, $ntf_name, $adsl_type, $netcnx); #FIXME
+ set_cnx_script($netc, "adsl", "ifup ppp0",
+ q(ifdown ppp0
+killall pppd
+), $netcnx->{type});
$config->{adsl} = { kind => $ntf_name, protocol => $adsl_type };
$handle_multiple_cnx->();
},
@@ -1232,6 +1236,7 @@ It is not necessary on most networks."),
if ($a) {
# local $::isWizard = 0;
my $_w = $in->wait_message('', N("Testing your connection..."), 1);
+ # FIXME: drop cnx_scripts (still used for modem connexions), use ifup/ifdown instead
connect_backend();
my $s = 30;
$type =~ /modem/ and $s = 50;