- fix behaviour of draknet when auto-install

- remove auto flag when error-in-step

4 files changed, 8 insertions, 7 deletions

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 5b7bd7805..ce08f0f70 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -256,7 +256,7 @@ sub configureNetwork {
     #- get current configuration of network device.
     require network;
     eval { network::read_all_conf($o->{prefix}, $o->{netc} ||= {}, $o->{intf} ||= {}) };
-    installStepsCall($o, $auto, 'configureNetwork', $ent_number == 1);
+    installStepsCall($o, $auto, 'configureNetwork', $ent_number == 1, $clicked);
 }
 #------------------------------------------------------------------------------
 sub installCrypto {
@@ -564,6 +564,7 @@ sub main {
 	    /^theme_changed$/ and redo MAIN;
 	    unless (/^already displayed/) {
 		eval { $o->errorInStep($_) };
+		$o->{steps}{$o->{step}}{auto} = 0;
 		$err = $@;
 		$err and next;
 	    }
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 5b8bf3ffd..0fff20890 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -567,7 +567,7 @@ sub selectMouse($) {
 sub configureNetwork {
     my ($o) = @_;
     require network;
-    network::configureNetwork2($o, $o->{prefix}, $o->{netc}, $o->{intf}, sub { $o->pkg_install(@_) });
+    network::configureNetwork2($o, $o->{prefix}, $o->{netc}, $o->{intf});
 }
 
 #------------------------------------------------------------------------------
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 6b2a96ecd..ed92489ea 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -741,10 +741,10 @@ sub updateModulesFromFloppy {
 
 #------------------------------------------------------------------------------
 sub configureNetwork {
-    my ($o, $first_time) = @_;
+    my ($o, $first_time, $noauto) = @_;
     require network::netconnect;
     network::netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o->{netc}, $o->{mouse}, $o, $o->{intf},
-		     sub { $o->pkg_install(@_) }, $first_time, $o->{lang} eq "fr_FR" && $o->{keyboard} eq "fr");
+			      $first_time, $o->{lang} eq "fr_FR" && $o->{keyboard} eq "fr", $noauto);
 }
 
 #-configureNetworkIntf moved to network
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",