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

[feed/packages.git] / net / rp-pppoe / files / pppoe-server.init

diff --git a/net/rp-pppoe/files/pppoe-server.init b/net/rp-pppoe/files/pppoe-server.init
index f0555ebd30da9d3b0eee93a96c7468b59a22a072..8ec0acc394a53d037e95886a5e7fe86d5cc6eb1d 100755 (executable)
--- a/net/rp-pppoe/files/pppoe-server.init
+++ b/net/rp-pppoe/files/pppoe-server.init
@@ -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"
 }