mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

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 <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2018-03-07 18:41:00 +01:00
parent cf3e9c3f71
commit ac5b0f1996
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/rp-pppoe/Makefile
View File

@ -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

2
net/rp-pppoe/files/pppoe-server.init
View File

@ -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