summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Chaumette <dchaumette@mandriva.com>2004-02-13 12:32:18 +0000
committerDamien Chaumette <dchaumette@mandriva.com>2004-02-13 12:32:18 +0000
commit36544eb36b39b049c73113e874a6147fb857c5cb (patch)
tree1a42f8441d0adfdfeaba9cdb6185ffba30d842f9
parent5c9f86f24d28f815c043158ffa15059adca2a431 (diff)
downloaddrakx-36544eb36b39b049c73113e874a6147fb857c5cb.tar
drakx-36544eb36b39b049c73113e874a6147fb857c5cb.tar.gz
drakx-36544eb36b39b049c73113e874a6147fb857c5cb.tar.bz2
drakx-36544eb36b39b049c73113e874a6147fb857c5cb.tar.xz
drakx-36544eb36b39b049c73113e874a6147fb857c5cb.zip
- do not flush /etc/sysconfig/drakconnect with an empty hash
- move $offer_to_connect after %adsl_devices declaration (fix typo?)
-rw-r--r--perl-install/network/netconnect.pm18
1 files changed, 10 insertions, 8 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index e3c860e14..7834a15f4 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -152,12 +152,6 @@ sub get_subwizard {
} else { $module = "" }
};
- my $offer_to_connect = sub {
- return "ask_connect_now" if $netc->{internet_cnx_choice} eq 'adsl' && $adsl_devices{$ntf_name};
- return "ask_connect_now" if member($netc->{internet_cnx_choice}, qw(modem isdn));
- return "end";
- };
-
my %adsl_devices = (
speedtouch => N("Alcatel speedtouch USB modem"),
sagem => N("Sagem USB modem"),
@@ -190,6 +184,12 @@ sub get_subwizard {
3 => N("CHAP"),
4 => N("PAP/CHAP"),
);
+
+ my $offer_to_connect = sub {
+ return "ask_connect_now" if $netc->{internet_cnx_choice} eq 'adsl' && $adsl_devices{$ntf_name};
+ return "ask_connect_now" if member($netc->{internet_cnx_choice}, qw(modem isdn));
+ return "end";
+ };
# main wizard:
my $wiz;
@@ -1050,8 +1050,10 @@ You may also enter the IP address of the gateway if you have one."),
name => N("Configuration is complete, do you want to apply settings ?"),
type => "yesorno",
post => sub {
- require Data::Dumper;
- output('/etc/sysconfig/drakconnect', Data::Dumper->Dump([$config], ['$p']));
+ if (keys %$config) {
+ require Data::Dumper;
+ output('/etc/sysconfig/drakconnect', Data::Dumper->Dump([$config], ['$p']));
+ }
"network_on_boot" },
},