summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Lepied <flepied@mandriva.com>2003-02-09 01:32:51 +0000
committerFrederic Lepied <flepied@mandriva.com>2003-02-09 01:32:51 +0000
commit8213be93bcfded0bfc338c82728df2ae29aaa40d (patch)
tree81bb0c3924555b7d0c95bb6bdbd25d222746b037
parent8476f626f9e40646d7f81c2661d912d605bc27cb (diff)
downloaddrakx-8213be93bcfded0bfc338c82728df2ae29aaa40d.tar
drakx-8213be93bcfded0bfc338c82728df2ae29aaa40d.tar.gz
drakx-8213be93bcfded0bfc338c82728df2ae29aaa40d.tar.bz2
drakx-8213be93bcfded0bfc338c82728df2ae29aaa40d.tar.xz
drakx-8213be93bcfded0bfc338c82728df2ae29aaa40d.zip
corrected expert case to restart network and if the user choose not to restart
the network, end the dialog normally.
-rw-r--r--perl-install/network/netconnect.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 5ddfef1eb..f888ab208 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -231,8 +231,8 @@ If you don't want to use the auto detection, deselect the checkbox.
network::configureNetwork2($in, $prefix, $netc, $intf);
my $network_configured = 1;
- eval { if ($netconnect::need_restart_network && $::isStandalone and ($::expert or $in->ask_yesorno(N("Network configuration"),
- N("The network needs to be restarted"), 1) or goto step_2)) {
+ eval { if ($netconnect::need_restart_network && $::isStandalone and (!$::expert or $in->ask_yesorno(N("Network configuration"),
+ N("The network needs to be restarted"), 1))) {
if (!run_program::rooted($prefix, "/etc/rc.d/init.d/network restart")) {
$success = 0;
$in->ask_okcancel(N("Network Configuration"),