rp-pppoe: fix pppoe-server init script

There were 2 missing "$" when options "maxsessions" and "optionsfile"
are checked for some content.

Also the local declaration of "optionsfile" was incorrect.

Signed-off-by: Martin Schiller <ms@dev.tdt.de>

diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index dceac898baa8fd078ca37d73e6102ad4fc5575f1..c1fcf7c6e5bb5498128b629009bfc2d55edbbf81 100644 (file)
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rp-pppoe
 PKG_VERSION:=4.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.uls.co.za/rp-pppoe/

diff --git a/net/rp-pppoe/files/pppoe-server.init b/net/rp-pppoe/files/pppoe-server.init
index 8ec0acc394a53d037e95886a5e7fe86d5cc6eb1d..168f26b5fc6a4e7d5d7b5efaa6173051b5348253 100755 (executable)
--- a/net/rp-pppoe/files/pppoe-server.init
+++ b/net/rp-pppoe/files/pppoe-server.init
@@ -16,7 +16,9 @@ pppoe_triggers() {
 
 pppoe_instance() {
     local cfg="$1"
-    local enabled interface device ac_name service_names service_name maxsessionsperpeer localip firstremoteip maxsessions optionsfiles randomsession unit offset timeout mss sync OPTIONS
+    local enabled interface device ac_name service_names service_name
+    local maxsessionsperpeer localip firstremoteip maxsessions optionsfile
+    local randomsession unit offset timeout mss sync OPTIONS
     config_get_bool enabled "$cfg" enabled 1
     [ "$enabled" -gt 0 ] || return 0
     config_get interface "$cfg" interface
@@ -48,8 +50,8 @@ pppoe_instance() {
        [ -n "$maxsessionsperpeer" ] && append OPTIONS "-x $maxsessionsperpeer"
        [ -n "$localip" ] && append OPTIONS "-L $localip"
        [ -n "$firstremoteip" ] && append OPTIONS "-R $firstremoteip"
-       [ -n "maxsessions" ] && append OPTIONS "-N $maxsessions"
-       [ -n "optionsfile" ] && append OPTIONS "-O $optionsfile"
+       [ -n "$maxsessions" ] && append OPTIONS "-N $maxsessions"
+       [ -n "$optionsfile" ] && append OPTIONS "-O $optionsfile"
        [ "$randomsession" = "1" ] && append OPTIONS "-r"
        [ "$unit" = "1" ] && append OPTIONS "-u"
        [ -n "$offset" ] && append OPTIONS "-o $offset"