summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-02-19 16:12:04 +0000
committerFrancois Pons <fpons@mandriva.com>2003-02-19 16:12:04 +0000
commited736118c64616427290badc43ba97585689a160 (patch)
tree8ad3e7036c5dd095e7ebe12fefa480225e8cea99
parentfaee102def3af597c6bcef3b9dc0a0b930188242 (diff)
downloaddrakx-ed736118c64616427290badc43ba97585689a160.tar
drakx-ed736118c64616427290badc43ba97585689a160.tar.gz
drakx-ed736118c64616427290badc43ba97585689a160.tar.bz2
drakx-ed736118c64616427290badc43ba97585689a160.tar.xz
drakx-ed736118c64616427290badc43ba97585689a160.zip
add ugly probed type of network configuration.
-rw-r--r--perl-install/install_steps_interactive.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 622b53e78..7041f0d0d 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -831,7 +831,12 @@ sub summaryBefore {
install_any::preConfigureTimezone($o);
#- get back network configuration.
require network;
- eval { network::network::read_all_conf($o->{prefix}, $o->{netc} ||= {}, $o->{intf} ||= {}) };
+ eval {
+ network::network::read_all_conf($o->{prefix}, $o->{netc} ||= {}, $o->{intf} ||= {});
+ #- ugly hack to determine network type (avoid saying not configured in summary).
+ $o->{intf}{eth0} and $o->{netcnx}{type} ||= 'lan';
+ $o->{intf}{ppp0} and $o->{netcnx}{type} ||= 'modem';
+ };
log::l("summaryBefore: network configuration: $@");
}