summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-03-11 14:43:39 +0000
committerFrancois Pons <fpons@mandriva.com>2003-03-11 14:43:39 +0000
commitb6bfb60fff12cfad855cf63e7abb226956cb21e9 (patch)
tree6dc94dff7e5fa4dffc21b0492492978125d4f552 /perl-install
parentc90472e7608a758bf75767200be8bd089af298c6 (diff)
downloaddrakx-b6bfb60fff12cfad855cf63e7abb226956cb21e9.tar
drakx-b6bfb60fff12cfad855cf63e7abb226956cb21e9.tar.gz
drakx-b6bfb60fff12cfad855cf63e7abb226956cb21e9.tar.bz2
drakx-b6bfb60fff12cfad855cf63e7abb226956cb21e9.tar.xz
drakx-b6bfb60fff12cfad855cf63e7abb226956cb21e9.zip
changed netcnx type probe (so that if an ethernet connection exists, it won't
cause netcnx type to be always lan).
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/network.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 22d763ea2..b5708fe53 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -480,10 +480,10 @@ sub probe_netcnx_type {
#- try to probe $netcnx->{type} which is used almost everywhere.
unless ($netcnx->{type}) {
#- ugly hack to determine network type (avoid saying not configured in summary).
- $intf->{eth0} and $netcnx->{type} ||= 'lan';
- $intf->{ppp0} and $netcnx->{type} ||= 'modem';
-e "$prefix/etc/ppp/peers/adsl" and $netcnx->{type} ||= 'adsl'; # enough ?
-e "$prefix/etc/ppp/ioptions1B" || -e "$prefix/etc/ppp/ioptions2B" and $netcnx->{type} ||= 'isdn'; # enough ?
+ $intf->{ppp0} and $netcnx->{type} ||= 'modem';
+ $intf->{eth0} and $netcnx->{type} ||= 'lan';
}
}