diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-07-29 07:42:46 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-07-29 07:42:46 +0000 |
| commit | 9efb82d3b7aff53989de00dde29a2c6d5c422305 (patch) | |
| tree | a9da2acb64343907e5d36cdba68e046389b49dac | |
| parent | 4b072a27e35d3476ea536a12538c092a6152b3f6 (diff) | |
| download | drakx-backup-do-not-use-9efb82d3b7aff53989de00dde29a2c6d5c422305.tar drakx-backup-do-not-use-9efb82d3b7aff53989de00dde29a2c6d5c422305.tar.gz drakx-backup-do-not-use-9efb82d3b7aff53989de00dde29a2c6d5c422305.tar.bz2 drakx-backup-do-not-use-9efb82d3b7aff53989de00dde29a2c6d5c422305.tar.xz drakx-backup-do-not-use-9efb82d3b7aff53989de00dde29a2c6d5c422305.zip | |
use connect option or pppd in net_cnx_up, not both
(to fix weird pppoe net_cnx_up script)
| -rw-r--r-- | perl-install/network/adsl.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index 676aa0c45..5fe1fb83e 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -285,8 +285,8 @@ user "$adsl->{login}" set_cnx_script($netc, "adsl", join("\n", "/sbin/route del default", $modems{$adsl_device}{start}, - "/usr/sbin/pppd file /etc/ppp/peers/adsl $modems{$adsl_device}{pppd_options}", - $ppp_options{$adsl_type}{connect} + $ppp_options{$adsl_type}{connect} || + "/usr/sbin/pppd file /etc/ppp/peers/adsl $modems{$adsl_device}{pppd_options}", ), $ppp_options{$adsl_type}{disconnect}, $netc->{adsltype} |