summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-09-20 15:09:15 +0000
committerdamien <damien@mandriva.com>2001-09-20 15:09:15 +0000
commitd2a1fbbcc6886bb19da39a396cd87e2569d62742 (patch)
treec52ef37348d8f5e3bb26b92c0087504e983e4209
parent2bbb64b24e8ca416d1e187b77800474f142cd8de (diff)
downloaddrakx-d2a1fbbcc6886bb19da39a396cd87e2569d62742.tar
drakx-d2a1fbbcc6886bb19da39a396cd87e2569d62742.tar.gz
drakx-d2a1fbbcc6886bb19da39a396cd87e2569d62742.tar.bz2
drakx-d2a1fbbcc6886bb19da39a396cd87e2569d62742.tar.xz
drakx-d2a1fbbcc6886bb19da39a396cd87e2569d62742.zip
don't reapply the conf, if already applied. usefull for dhcp, because the network should be restarted after configured
-rw-r--r--perl-install/network/netconnect.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 6d3805566..79e605862 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -234,6 +234,7 @@ ifdown eth0
step_3:
network::configureNetwork2($in, $prefix, $netc, $intf);
+ my $network_configured = 1;
if ($netconnect::need_restart_network && $::isStandalone and ($::expert or $in->ask_yesorno(_("Network configuration"),
_("The network needs to be restarted"), 1))) {
@@ -258,7 +259,7 @@ environnement to avoid hostname changing problem."));
step_5:
- network::configureNetwork2($in, $prefix, $netc, $intf);
+ $network_configured or network::configureNetwork2($in, $prefix, $netc, $intf);
if ($netcnx->{type} =~ /modem/ || $netcnx->{type} =~ /isdn_external/) {
output "$prefix$connect_prog",