summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-07-02 08:12:27 +0000
committerOlivier Blin <oblin@mandriva.org>2004-07-02 08:12:27 +0000
commit114ecae4e367f0c9ddce7a54bd15d75867963b92 (patch)
treebc00163a2a814c27681062b52150f38ad4a3306d
parent262d3b7f4eeeab90cb36846a9683438f7e1c3c63 (diff)
downloaddrakx-backup-do-not-use-114ecae4e367f0c9ddce7a54bd15d75867963b92.tar
drakx-backup-do-not-use-114ecae4e367f0c9ddce7a54bd15d75867963b92.tar.gz
drakx-backup-do-not-use-114ecae4e367f0c9ddce7a54bd15d75867963b92.tar.bz2
drakx-backup-do-not-use-114ecae4e367f0c9ddce7a54bd15d75867963b92.tar.xz
drakx-backup-do-not-use-114ecae4e367f0c9ddce7a54bd15d75867963b92.zip
pptp support (partial fix for #6515)
-rw-r--r--perl-install/network/adsl.pm9
1 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index c0d406dd9..5c8f8e9f0 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -100,6 +100,7 @@ sub adsl_conf_backend {
# FIXME: should not be needed:
defined $o_netcnx and $netc->{adsltype} = $o_netcnx->{type};
$netc->{adsltype} ||= "adsl_$adsl_type";
+ $adsl_type eq 'pptp' and $adsl_device = 'pptp_modem';
my $bewan_module;
$bewan_module = $o_netcnx->{bus} eq 'PCI' ? 'unicorn_pci_atm' : 'unicorn_usb_atm' if $adsl_device eq "bewan";
@@ -189,6 +190,12 @@ linkname eciadsl
noauth
lcp-echo-interval 0)
},
+ pptp_modem =>
+ {
+ server => {
+ pptp => qq("pty "/usr/sbin/pptp 10.0.0.138 --nolaunchpppd"),
+ },
+ },
);
@@ -198,7 +205,7 @@ lcp-echo-interval 0)
my %packages = (
pppoa => [ qw(ppp-pppoatm) ],
pppoe => [ qw(ppp-pppoe rp-pppoe) ],
- pptp => [ qw(pptp-linux pptp-adsl) ],
+ pptp => [ qw(pptp-linux) ],
);
$in->do_pkgs->install(@{$packages{$adsl_type}}) if !$>;
output("$::prefix/etc/ppp/options",