summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-07-07 07:47:00 +0000
committerOlivier Blin <oblin@mandriva.org>2005-07-07 07:47:00 +0000
commit675829068cf6ca98fec57a57b1872624afff7919 (patch)
tree3ea9ce1f290721dd06dd35588751a0f34203b064
parent0b73e58474d653def8257ab66faf8bfabc916a09 (diff)
downloaddrakx-backup-do-not-use-675829068cf6ca98fec57a57b1872624afff7919.tar
drakx-backup-do-not-use-675829068cf6ca98fec57a57b1872624afff7919.tar.gz
drakx-backup-do-not-use-675829068cf6ca98fec57a57b1872624afff7919.tar.bz2
drakx-backup-do-not-use-675829068cf6ca98fec57a57b1872624afff7919.tar.xz
drakx-backup-do-not-use-675829068cf6ca98fec57a57b1872624afff7919.zip
do not restart network to apply modifications, run ifup or ifplugd instead
-rw-r--r--perl-install/network/netconnect.pm9
1 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 76fd01044..0ff164c5a 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -158,9 +158,18 @@ sub real_main {
);
my $offer_to_connect = sub {
+ network::tools::stop_ifplugd($net->{net_interface});
+
if ($net->{type} eq 'adsl' && !member($net->{adsl}{method}, qw(static dhcp)) ||
member($net->{type}, qw(modem isdn isdn_external))) {
return "ask_connect_now";
+ } else {
+ network::tools::stop_net_interface($net, 0);
+ if ($ethntf->{MII_NOT_SUPPORTED} eq "yes" || $::isInstall) {
+ network::tools::start_net_interface($net, 0);
+ } else {
+ network::tools::start_ifplugd($net->{net_interface});
+ }
}
return "end";
};