summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-02-26 09:48:43 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-02-26 09:48:43 +0000
commit153d82f64f41a0c4f9b5965f44575ed3b5fafe44 (patch)
tree538780157f6fd229a19968d6780d9265c7833192
parent5d21873578a1e74480cb6d3000eba33305af7666 (diff)
downloaddrakx-153d82f64f41a0c4f9b5965f44575ed3b5fafe44.tar
drakx-153d82f64f41a0c4f9b5965f44575ed3b5fafe44.tar.gz
drakx-153d82f64f41a0c4f9b5965f44575ed3b5fafe44.tar.bz2
drakx-153d82f64f41a0c4f9b5965f44575ed3b5fafe44.tar.xz
drakx-153d82f64f41a0c4f9b5965f44575ed3b5fafe44.zip
reverse debug stuff that should never have been commited
-rw-r--r--perl-install/network/netconnect.pm20
1 files changed, 13 insertions, 7 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 510e76f4d..1f17511c5 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -125,7 +125,7 @@ sub real_main {
return "multiple_internet_cnx";
} else {
$netc->{internet_cnx_choice} = (keys %{$netc->{internet_cnx}})[0] if $nb == 1;
- return "network_on_boot";
+ return $::isInstall ? "network_on_boot" : "apply_settings";
}
};
@@ -1019,13 +1019,19 @@ N("Last but not least you can also type in your DNS server IP addresses."),
[ { label => N("Internet connection"), val => \$netc->{internet_cnx_choice},
list => [ keys %{$netc->{internet_cnx}} ] } ];
},
+ post => sub { $::isInstall ? "network_on_boot" : "apply_settings" },
+ },
+
+ apply_settings =>
+ {
+ name => N("Configuration is complete, do you want to apply settings ?"),
+ type => "yesorno",
post => sub {
- if (keys %$config) {
- require Data::Dumper;
- output('/etc/sysconfig/drakconnect', Data::Dumper->Dump([$config], ['$p']));
- }
- return "network_on_boot";
- },
+ if (keys %$config) {
+ require Data::Dumper;
+ output('/etc/sysconfig/drakconnect', Data::Dumper->Dump([$config], ['$p']));
+ }
+ "network_on_boot" },
},
network_on_boot =>