summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Chaumette <dchaumette@mandriva.com>2004-02-18 15:30:56 +0000
committerDamien Chaumette <dchaumette@mandriva.com>2004-02-18 15:30:56 +0000
commitf648206940c7ff7dd2cba340bfab719f32f64c2c (patch)
tree1efe32fa9a39aea1741c41dc0955da2942d663f3
parentbd434cd6d96d1d86ded0fb1521aa8633414696e9 (diff)
downloaddrakx-f648206940c7ff7dd2cba340bfab719f32f64c2c.tar
drakx-f648206940c7ff7dd2cba340bfab719f32f64c2c.tar.gz
drakx-f648206940c7ff7dd2cba340bfab719f32f64c2c.tar.bz2
drakx-f648206940c7ff7dd2cba340bfab719f32f64c2c.tar.xz
drakx-f648206940c7ff7dd2cba340bfab719f32f64c2c.zip
fix adsl at boot, better and more clean
-rwxr-xr-xperl-install/standalone/drakconnect11
1 files changed, 5 insertions, 6 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 928a0d103..2319c6078 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -252,7 +252,11 @@ sub build_tree {
if ($interface eq 'adsl') {
$intf->{pages} = { N("TCP/IP") => 1, N("Account") => 1, N("Options") => 1, N("Information") => 1 };
network::adsl::adsl_probe_info($intf, $netc, $protocol, $interface_kind);
- $intf->{save} = sub { network::adsl::adsl_conf_backend($in, $intf, $netc, $interface_kind, $protocol) };
+ $intf->{save} = sub {
+ $netc->{internet_cnx_choice} = 'adsl';
+ $netc->{at_boot} = $intf->{ONBOOT} eq 'yes' ? 1 : 0;
+ network::adsl::adsl_conf_backend($in, $intf, $netc, $interface_kind, $protocol)
+ };
}
elsif ($interface eq 'modem') {
$intf->{pages} = { N("TCP/IP") => 1, N("Account") => 1, N("Options") => 1 };
@@ -546,11 +550,6 @@ sub save {
$p->{$_}{intf}{save} ? $p->{$_}{intf}{save}->() : apply($netc, $p->{$_}{intf});
}
- if (exists $p->{adsl}) {
- $p->{adsl}{intf}{ONBOOT} ? system("/sbin/chkconfig --add internet 2> /dev/null") :
- system("/sbin/chkconfig --del internet 2> /dev/null");
- };
-
system("/etc/rc.d/init.d/network restart");
$apply_button->set_sensitive(0);
}