Browse Source

net/rp-pppoe: fix typo in init script

Due to a typo in the init scripts, certain parameters are not appended
to the cmdline. (max. # of concurrent sessions).
For backwards compatibility leave both spellings in place.

Signed-off-by: Paul Wassi <p.wassi@gmx.at>
lilik-openwrt-22.03
Paul Wassi 7 years ago
parent
commit
a5c43479ce
3 changed files with 9 additions and 5 deletions
  1. +1
    -1
      net/rp-pppoe/Makefile
  2. +4
    -2
      net/rp-pppoe/files/pppoe-relay.init
  3. +4
    -2
      net/rp-pppoe/files/pppoe-server.init

+ 1
- 1
net/rp-pppoe/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=rp-pppoe
PKG_VERSION:=3.12
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=Daniel Dickinson <lede@cshore.thecshore.com>
PKG_LICENSE:=LGPL-2.0+


+ 4
- 2
net/rp-pppoe/files/pppoe-relay.init View File

@ -23,11 +23,12 @@ pppoe_triggers() {
pppoe_relay_instance() {
local cfg="$1"
local interface server_interfaces client_interfaces both_interfaces maxsessions timeout OPTIONS
local interface server_interfaces client_interfaces both_interfaces maxsessions maxsesssions timeout OPTIONS
config_get server_interfaces "$cfg" server_interface
config_get client_interfaces "$cfg" client_interface
config_get both_interfaces "$cfg" both_interfaces
config_get maxsessions "$cfg" maxsesssions
config_get maxsessions "$cfg" maxsessions
config_get maxsesssions "$cfg" maxsesssions
config_get timeout "$cfg" timeout
config_get_bool use_non_uci_config "$cfg" use_non_uci_config 0
@ -44,6 +45,7 @@ pppoe_relay_instance() {
for interface in $both_interfaces; do
append OPTIONS "-B $interface"
done
[ -n "$maxsessions" ] && append OPTIONS "-n $maxsessions"
[ -n "$maxsesssions" ] && append OPTIONS "-n $maxsesssions"
[ -n "$timeout" ] && append OPTIONS "-i $timeout"
fi


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

@ -12,11 +12,12 @@ pppoe_triggers() {
pppoe_instance() {
local cfg="$1"
local interface ac_name service_names service_name maxsessionsperpeer localip firstremoteip maxsessions optionsfiles randomsession unit offset timeout mss sync OPTIONS
local interface ac_name service_names service_name maxsessionsperpeer maxsesssionsperpeer localip firstremoteip maxsessions optionsfiles randomsession unit offset timeout mss sync OPTIONS
config_get interface "$cfg" interface
config_get ac_name "$cfg" ac_name
config_get service_names "$cfg" service_name
config_get maxsessionsperpeer "$cfg" maxsesssionsperpeer
config_get maxsessionsperpeer "$cfg" maxsessionsperpeer
config_get maxsesssionsperpeer "$cfg" maxsesssionsperpeer
config_get localip "$cfg" localip
config_get firstremoteip "$cfg" firstremoteip
config_get maxsessions "$cfg" maxsessions
@ -38,6 +39,7 @@ pppoe_instance() {
append OPTIONS "-S $service_name"
done
append OPTIONS "-I $interface"
[ -n "$maxsessionsperpeer" ] && append OPTIONS "-x $maxsessionsperpeer"
[ -n "$maxsesssionsperpeer" ] && append OPTIONS "-x $maxsesssionsperpeer"
[ -n "$localip" ] && append OPTIONS "-L $localip"
[ -n "$firstremoteip" ] && append OPTIONS "-R $firstremoteip"


Loading…
Cancel
Save