cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

rp-pppoe: add support for logical interface names and fix interface triggers

Browse Source 
Signed-off-by: Alin Nastac <alin.nastac@gmail.com>
This commit is contained in:
Alin Nastac
2018-04-19 08:33:17 +02:00
committed by Alin Nastac
parent 26f8225d0a
commit b8e6e7f0e8
3 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/rp-pppoe/files/pppoe-server.init
+9 -9
View File
@@ -11,11 +11,12 @@ pppoe_triggers() {
config_get_bool enabled "$cfg" enabled 1
[ "$enabled" -gt 0 ] || return 0
config_get interface "$cfg" interface
procd_add_reload_interface_trigger $interface
}
pppoe_instance() {
local cfg="$1"
local enabled interface 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 maxsessionsperpeer localip firstremoteip maxsessions optionsfiles randomsession unit offset timeout mss sync OPTIONS
config_get_bool enabled "$cfg" enabled 1
[ "$enabled" -gt 0 ] || return 0
config_get interface "$cfg" interface
@@ -37,12 +38,13 @@ pppoe_instance() {
if [ "$use_non_uci_config" -gt 0 ]; then
. /etc/default/pppoe-server
else
[ -z "$interface" ] && return 1
. /lib/functions/network.sh
network_get_physdev device $interface || return 1
[ -n "$ac_name" ] && append OPTIONS "-C $ac_name"
for service_name in $service_names; do
append OPTIONS "-S $service_name"
done
append OPTIONS "-I $interface"
append OPTIONS "-I $device"
[ -n "$maxsessionsperpeer" ] && append OPTIONS "-x $maxsessionsperpeer"
[ -n "$localip" ] && append OPTIONS "-L $localip"
[ -n "$firstremoteip" ] && append OPTIONS "-R $firstremoteip"
@@ -57,8 +59,8 @@ pppoe_instance() {
fi
procd_open_instance
procd_set_param command /usr/sbin/pppoe-server -F
procd_append_param command -k $OPTIONS
procd_set_param command /usr/sbin/pppoe-server -F -k $OPTIONS
procd_set_param respawn
procd_set_param file /etc/ppp/options
procd_append_param file /etc/ppp/pppoe-server-options
procd_close_instance
@@ -70,10 +72,8 @@ start_service() {
}
service_triggers() {
local interface
procd_add_reload_trigger "pppoe"
config_load pppoe
config_foreach pppoe_triggers pppoe_server
procd_add_reload_trigger "pppoe"
procd_add_interface_trigger "$interface"
}