summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-08-14 14:36:57 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-08-14 14:36:57 +0000
commit6cd4d28674f9131bdf17166c1c0101b3a0045c2b (patch)
tree349dc7da9f93b76c9b94a4c85f643723c1be4ea6 /perl-install/network
parentc231a43106143e04ad0cb7f2542723cfec66777d (diff)
downloaddrakx-6cd4d28674f9131bdf17166c1c0101b3a0045c2b.tar
drakx-6cd4d28674f9131bdf17166c1c0101b3a0045c2b.tar.gz
drakx-6cd4d28674f9131bdf17166c1c0101b3a0045c2b.tar.bz2
drakx-6cd4d28674f9131bdf17166c1c0101b3a0045c2b.tar.xz
drakx-6cd4d28674f9131bdf17166c1c0101b3a0045c2b.zip
- fix behaviour of draknet when auto-install
- remove auto flag when error-in-step
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/netconnect.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 43737064e..326f6cd48 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -109,7 +109,7 @@ sub pre_func {
}
sub main {
- my ($prefix, $netcnx, $netc, $mouse, $in, $intf, $first_time, $direct_fr) = @_;
+ my ($prefix, $netcnx, $netc, $mouse, $in, $intf, $first_time, $direct_fr, $noauto) = @_;
MDK::Common::Globals::init(
in => $in,
prefix => $prefix,
@@ -127,8 +127,8 @@ sub main {
my $direct_net_install;
if ($first_time && $::isInstall && ($in->{method} eq "ftp" || $in->{method} eq "http" || $in->{method} eq "nfs")) {
- (!$::expert or $in->ask_okcancel(_("Network Configuration"),
- _("Because you are doing a network installation, your network is already configured.
+ (!($::expert || $noauto) or $in->ask_okcancel(_("Network Configuration"),
+ _("Because you are doing a network installation, your network is already configured.
Click on Ok to keep your configuration, or cancel to reconfigure your Internet & Network connection.
"), 1)) and do {
output "$prefix$connect_file",