summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Chaumette <dchaumette@mandriva.com>2004-06-01 15:50:40 +0000
committerDamien Chaumette <dchaumette@mandriva.com>2004-06-01 15:50:40 +0000
commit17014fd9212a661c4725dce7c7f5882a54c4b74c (patch)
treee5321576581c4f6cdacc4f9dc39acb0ec71b2bdc
parent1f6abba6caeaa38437aaafca9eae85cc79de01f3 (diff)
downloaddrakx-17014fd9212a661c4725dce7c7f5882a54c4b74c.tar
drakx-17014fd9212a661c4725dce7c7f5882a54c4b74c.tar.gz
drakx-17014fd9212a661c4725dce7c7f5882a54c4b74c.tar.bz2
drakx-17014fd9212a661c4725dce7c7f5882a54c4b74c.tar.xz
drakx-17014fd9212a661c4725dce7c7f5882a54c4b74c.zip
new way to specify how to up connection for pppoe(xDSL) and others(ADSL)
-rw-r--r--perl-install/network/adsl.pm11
1 files changed, 5 insertions, 6 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index c4a3743fd..607fb02bc 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -277,14 +277,13 @@ user "$adsl->{login}"
}
#- FIXME I'm lame:
- #- -ONBOOT hardcoded
- #- -pptp has to be done within pppd (no more use of /usr/bin/pptp)
- #- -adsl-start will be called by ifup-ppp, good for pppoe, bad for the others. Most of the time a single `pppd call adsl` is enough.
- #- -still have to check hotplug firmware upload for usb modems
- #- Mostly broken for now :(
+ #- ONBOOT hardcoded
+ #- pptp has to be done within pppd (no more use of /usr/bin/pptp)
+ #- still have to check hotplug firmware upload for usb modems
+ my $kind = $adsl_type eq 'pppoe' ? 'xDSL' : 'ADSL';
output_with_perm("$::prefix/etc/sysconfig/network-scripts/ifcfg-ppp0", 0705, qq(DEVICE=ppp0
ONBOOT=no
-TYPE=xDSL
+TYPE=$kind
));
# sagem specific stuff