summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2002-03-07 18:11:31 +0000
committerdamien <damien@mandriva.com>2002-03-07 18:11:31 +0000
commit13ea7c77c9bc5b9c24139bce7120db95caa8865e (patch)
tree395e4c784c5aeed76e132cb9ccca9ebf480452c0
parent2ff2d658ed58b343728a468e45d7b416aa79a4e8 (diff)
downloaddrakx-13ea7c77c9bc5b9c24139bce7120db95caa8865e.tar
drakx-13ea7c77c9bc5b9c24139bce7120db95caa8865e.tar.gz
drakx-13ea7c77c9bc5b9c24139bce7120db95caa8865e.tar.bz2
drakx-13ea7c77c9bc5b9c24139bce7120db95caa8865e.tar.xz
drakx-13ea7c77c9bc5b9c24139bce7120db95caa8865e.zip
corrected network/internet restart when already connected
-rwxr-xr-xperl-install/standalone/draknet7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index 1b5c0b5ed..a31a5cdcf 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -355,13 +355,14 @@ sub apply {
$netcnx->{type} eq 'modem' and any::pppConfig($in, $netcnx->{$netcnx->{type}}, '');
$netcnx->{type} eq 'isdn_internal' and network::isdn::isdn_write_config_backend($netcnx->{$netcnx->{type}}, 1, $netc, $netcnx); #$light
$netcnx->{type} eq 'isdn_external' and any::pppConfig($in, $netcnx->{$netcnx->{type}}, '');
- $netcnx->{type} eq 'adsl_ppoe' and network::adsl::adsl_conf_backend($netcnx->{$netcnx->{type}}, $netc, 'pppoe', $netcnx);
- $netcnx->{type} eq 'adsl_pptp' and network::adsl::adsl_conf_backend($netcnx->{$netcnx->{type}}, $netc, 'pptp', $netcnx);
+ my $a = $netcnx->{type};
+ $a =~ s/adsl_//;
+ $netcnx->{type} =~ 'adsl' and network::adsl::adsl_conf_backend($netcnx->{$netcnx->{type}}, $netc, $a, $netcnx);
$netcnx->{dhcp_client} and $netc->{dhcp_client} = $netcnx->{dhcp_client};
network::configureNetwork2($in, $prefix, $netc, $intf);
$netcnx->{type} =~ /adsl/ or system("/sbin/chkconfig --del adsl 2> /dev/null");
- system("$prefix/etc/rc.d/init.d/network restart");
+ $netcnx->{type} !~ /adsl_p/ and system("$prefix/etc/rc.d/init.d/network restart");
$button_apply->set_sensitive(0);
}