diff options
| -rw-r--r-- | perl-install/network/netconnect.pm | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index cca84f711..7e57ff7e7 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -175,15 +175,8 @@ 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_1 }; $in->exit(0) if $@ =~ /wizcancel/; - eval { - $in->ask_from_listf_raw({ title => N("Network configuration"), - messages => N("Configuration is complete, do you want to apply settings ?") - }, - [ { label => "", hidden => 1 } ], - ) or goto step_2_1 }; $in->exit(0) if $@ =~ /wizcancel/; - + eval { $in->ask_yesorno(N("Network configuration"), N("Configuration is complete, do you want to apply settings ?"), 1) or goto step_2_2 }; + $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?")); @@ -200,6 +193,7 @@ If you don't want to use the auto detection, deselect the checkbox. network::configureNetwork2($in, $prefix, $netc, $intf); my $network_configured = 1; + step_2_2: eval { if ($netconnect::need_restart_network && $::isStandalone && (!$::expert || $in->ask_yesorno(N("Network configuration"), N("The network needs to be restarted. Do you want to restart it ?"), 1))) { if (!run_program::rooted($prefix, "/etc/rc.d/init.d/network restart")) { |