rp-pppoe: fix pppoe server issues

Use ppp-mod-pppoe instead of shipping its own broken plugin
Always use rp-pppoe.so instead of the (not packaged) pppoe user space
implementation

Signed-off-by: Felix Fietkau <redacted>

diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 26b49273747355cfbb2ac4293494f6450a4cb5e1..2191a1aea5e9139f1e3b38b04302ba491065ba43 100644 (file)
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -69,7 +69,7 @@ endef
 
 define Package/rp-pppoe-server
   $(call Package/rp-pppoe/Default)
-  DEPENDS:=+rp-pppoe-common
+  DEPENDS:=+rp-pppoe-common +ppp-mod-pppoe
   TITLE+= server
 endef
 
@@ -102,7 +102,7 @@ endef
 TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/src/libevent -isystem $(PKG_BUILD_DIR)/missing-headers
 CONFIGURE_PATH := ./src
 CONFIGURE_ARGS += ac_cv_path_PPPD=/usr/sbin/pppd --enable-plugin=$(STAGING_DIR)/usr/include/
-MAKE_FLAGS := DESTDIR="$(PKG_INSTALL_DIR)" install
+MAKE_FLAGS := DESTDIR="$(PKG_INSTALL_DIR)" PLUGIN_PATH=rp-pppoe.so install
 MAKE_PATH := ./src
 
 define Build/Prepare
@@ -132,7 +132,6 @@ define Package/rp-pppoe-server/install
        $(INSTALL_DIR) $(1)/etc/ppp/plugins
        $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-server $(1)/usr/sbin/
-       $(CP) $(PKG_INSTALL_DIR)/etc/ppp/plugins/rp-pppoe.so $(1)/etc/ppp/plugins/
        $(INSTALL_DATA) ./files/pppoe-server.default $(1)/etc/uci-defaults/
 endef
 

diff --git a/net/rp-pppoe/files/pppoe-server.init b/net/rp-pppoe/files/pppoe-server.init
index f3a53dfd68f80d3bca3f7dfa6f2b715e68b60bc5..8236eec0416f17c7dfcba0945837ae1f95fbb600 100755 (executable)
--- a/net/rp-pppoe/files/pppoe-server.init
+++ b/net/rp-pppoe/files/pppoe-server.init
@@ -53,7 +53,7 @@ pppoe_instance() {
 
        procd_open_instance
        procd_set_param command /usr/sbin/pppoe-server -F
-       procd_append_param command $OPTIONS
+       procd_append_param command -k $OPTIONS
        procd_set_param file /etc/ppp/options
        procd_append_param file /etc/ppp/pppoe-server-options
        procd_close_instance