diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-07-29 02:28:25 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-07-29 02:28:25 +0000 |
| commit | b82ae5700affc6b2cb5fe4081b3eea4a2219e363 (patch) | |
| tree | 91e02c02a34ba3c05fd95b4d76942c7f3d7914ae | |
| parent | 3c29a1f97b55d63192559580f04087dfb3139517 (diff) | |
| download | drakx-backup-do-not-use-b82ae5700affc6b2cb5fe4081b3eea4a2219e363.tar drakx-backup-do-not-use-b82ae5700affc6b2cb5fe4081b3eea4a2219e363.tar.gz drakx-backup-do-not-use-b82ae5700affc6b2cb5fe4081b3eea4a2219e363.tar.bz2 drakx-backup-do-not-use-b82ae5700affc6b2cb5fe4081b3eea4a2219e363.tar.xz drakx-backup-do-not-use-b82ae5700affc6b2cb5fe4081b3eea4a2219e363.zip | |
split server and plugin options, in order to support again bewan
modems (pppd_options wasn't used anywhere, they couldn't work)
| -rw-r--r-- | perl-install/network/adsl.pm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index f8b6ce380..c887ec781 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -115,7 +115,9 @@ modprobe $bewan_module sleep 10 ), stop => qq(modprobe -r $bewan_module), - pppd_options => "plugin pppoatm.so $netc->{vpi}." . hex($netc->{vci}), + plugin => { + pppoa => "pppoatm.so $netc->{vpi}." . hex($netc->{vci}) + }, ppp_options => qq( lock ipparam ppp0 @@ -138,9 +140,10 @@ sync start => '/usr/sbin/modem_run -k -n 2 -f /usr/share/speedtouch/mgmt.o', overide_script => 1, server => { - pppoa => '"/usr/sbin/pppoa3 -c" -plugin pppoatm.so -' . join('.', hex($netc->{vpi}), hex($netc->{vci})), + pppoa => qq("/usr/sbin/pppoa3 -c") + }, + plugin => { + pppoa => "pppoatm.so " . join('.', hex($netc->{vpi}), hex($netc->{vci})), }, ppp_options => qq( sync @@ -243,6 +246,7 @@ defaultroute) ); my $pty_option = $modems{$adsl_device}{server}{$adsl_type} && "pty $modems{$adsl_device}{server}{$adsl_type}"; + my $plugin = $modems{$adsl_device}{plugin}{$adsl_type} && "plugin $modems{$adsl_device}{plugin}{$adsl_type}"; output("$::prefix/etc/ppp/peers/ppp0", qq(noauth noipdefault @@ -257,6 +261,7 @@ persist usepeerdns defaultroute $pty_option +$plugin user "$adsl->{login}" )); |