summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-11-08 07:39:10 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-11-08 07:39:10 +0000
commitbd4c3d7f7956db221225a1798cb245d5c9cb2c81 (patch)
treeb8ffa6f4e6dcc3e853df2997f5b5789cd0afcee5
parent5c1306aaf86d60fb67d1465fccf77101c1fef234 (diff)
downloaddrakx-bd4c3d7f7956db221225a1798cb245d5c9cb2c81.tar
drakx-bd4c3d7f7956db221225a1798cb245d5c9cb2c81.tar.gz
drakx-bd4c3d7f7956db221225a1798cb245d5c9cb2c81.tar.bz2
drakx-bd4c3d7f7956db221225a1798cb245d5c9cb2c81.tar.xz
drakx-bd4c3d7f7956db221225a1798cb245d5c9cb2c81.zip
fix last part of #5315: do not ask for confirmation at install time
rationale: while this is reasonable within standalone drakconnect, it's quite less needed at install time
-rw-r--r--perl-install/network/netconnect.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index d632e396b..c25470e27 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -166,7 +166,7 @@ If you don't want to use the auto detection, deselect the checkbox.
$netc->{internet_cnx_choice} = (keys %{$netc->{internet_cnx}})[0];
}
- eval { $in->ask_yesorno(N("Network configuration"), N("Configuration is complete, do you want to apply settings ?"), 1) or goto step_2_2 };
+ eval { $in->ask_yesorno(N("Network configuration"), N("Configuration is complete, do you want to apply settings ?"), 1) or goto step_2_2 } if !$::isInstall;
$in->exit(0) if $@ =~ /wizcancel/;
member($netc->{internet_cnx_choice}, ('adsl', 'isdn')) and $netc->{at_boot} = $in->ask_yesorno(N("Network Configuration Wizard"), N("Do you want to start the connection at boot?"));