commit: 750d89eaf772551588c460a0c8425579e7d49677
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 5 12:51:41 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan 5 14:26:56 2021 +0000
URL: https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=750d89ea
net/pppd.sh: ppp-2.4.9 has renamed rp-pppoe.so to pppoe.so
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
doc/net.example.Linux.in | 5 +++--
net/pppd.sh | 7 +++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index d88302b..b404329 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -805,9 +805,10 @@
#link_ppp0="pty 'your_link_command'" # PPP links over ssh, rsh, etc
#
# Here you should specify what pppd plugins you want to use
-# Available plugins are: pppoe, pppoa, capi, dhcpc, minconn, radius,
+# Available plugins are: pppoe, rp-pppoe, pppoa, capi, dhcpc, minconn, radius,
# radattr, radrealms and winbind
-#plugins_ppp0="pppoe" # Required plugin for PPPoE
+#plugins_ppp0="pppoe" # Required plugin for PPPoE with
>=ppp-2.4.9
+#plugins_ppp0="rp-pppoe" # Required plugin for PPPoE with
<ppp-2.4.9
#plugins_ppp0="pppoa vc-encaps" # Required plugin for PPPoA
with an option
#plugins_ppp0="capi" # Required plugin for ISDN
#
diff --git a/net/pppd.sh b/net/pppd.sh
index e3c4d43..c6a6a8a 100644
--- a/net/pppd.sh
+++ b/net/pppd.sh
@@ -175,14 +175,13 @@ pppd_pre_start()
case "$1" in
passwordfd) continue;;
pppoa) shift; set -- "pppoatm" "$@";;
- pppoe) shift; set -- "rp-pppoe" "$@";;
capi) shift; set -- "capiplugin" "$@";;
esac
case "$1" in
- rp-pppoe) haspppoe=true;;
- pppoatm) haspppoa=true;;
+ pppoatm) haspppoa=true;;
+ pppoe|rp-pppoe) haspppoe=true;;
esac
- if [ "$1" = "rp-pppoe" ] || [ "$1" = "pppoatm" -a "${link}" !=
"/dev/null" ]; then
+ if [ "$1" = "pppoe" ] || [ "$1" = "rp-pppoe" ] || [ "$1" =
"pppoatm" -a "${link}" != "/dev/null" ]; then
opts="${opts} connect true"
set -- "$@" "${link}"
fi
