summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-02-26 09:51:30 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-02-26 09:51:30 +0000
commitbc8791eeda7d7340df93ffe176406ddfd8e29dd8 (patch)
tree7e00df008ce2d8c91cae964bfa4e3e03f074934a /perl-install
parent153d82f64f41a0c4f9b5965f44575ed3b5fafe44 (diff)
downloaddrakx-bc8791eeda7d7340df93ffe176406ddfd8e29dd8.tar
drakx-bc8791eeda7d7340df93ffe176406ddfd8e29dd8.tar.gz
drakx-bc8791eeda7d7340df93ffe176406ddfd8e29dd8.tar.bz2
drakx-bc8791eeda7d7340df93ffe176406ddfd8e29dd8.tar.xz
drakx-bc8791eeda7d7340df93ffe176406ddfd8e29dd8.zip
skip apply_setting step for now since anyway we've already written
most config files... (btw, now installer also write cnx type as side effect)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/netconnect.pm16
1 files changed, 8 insertions, 8 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 1f17511c5..1157cb75c 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 $::isInstall ? "network_on_boot" : "apply_settings";
+ return "network_on_boot";
}
};
@@ -1019,19 +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" },
+ post => sub {
+ if (keys %$config) {
+ require Data::Dumper;
+ output('/etc/sysconfig/drakconnect', Data::Dumper->Dump([$config], ['$p']));
+ }
+ return "network_on_boot";
+ },
},
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']));
- }
- "network_on_boot" },
},
network_on_boot =>