olsrd: splitting IPv6/4 configuration and start scripts

[lede-routing/.git] / olsrd / files / olsrd.init

diff --git a/olsrd/files/olsrd.init b/olsrd/files/olsrd.init
index c8f1df566c1b1b975fbf717d3d6f615c3444709b..d0c4e0035262db8c0250e8425fd6a0749ab6dc80 100644 (file)
--- a/olsrd/files/olsrd.init
+++ b/olsrd/files/olsrd.init
@@ -6,10 +6,6 @@ START=65
 SERVICE_DAEMONIZE=1
 SERVICE_WRITE_PID=1
 
-CONF=/var/etc/olsrd.conf
-PID=/var/run/olsrd.pid
-PID6=/var/run/olsrd.ipv6.pid
-
 OLSRD_OLSRD_SCHEMA='ignore:internal config_file:internal DebugLevel=0 AllowNoInt=yes'
 OLSRD_IPCCONNECT_SCHEMA='ignore:internal Host:list Net:list2'
 OLSRD_LOADPLUGIN_SCHEMA='ignore:internal library:internal Host4:list Net4:list2 Host:list Net:list2 Host6:list Net6:list2 Ping:list redistribute:list NonOlsrIf:list name:list lat lon latlon_infile HNA:list2 hosts:list2'
@@ -766,7 +762,7 @@ start() {
 
        . /lib/functions/network.sh
 
-       config_load olsrd
+       config_load $UCI_CONF_NAME
        reset_cb
 
        OLSRD_CONFIG_FILE=
@@ -774,9 +770,9 @@ start() {
 
        if [ -z "$OLSRD_CONFIG_FILE" ]; then
                mkdir -p -- /var/etc/
-               olsrd_write_config > /var/etc/olsrd.conf
+               olsrd_write_config > /var/etc/$UCI_CONF_NAME.conf
                if [ "$INTERFACES_COUNT" -gt 0 -a "$OLSRD_COUNT" -gt 0 ]; then
-                       OLSRD_CONFIG_FILE=/var/etc/olsrd.conf
+                       OLSRD_CONFIG_FILE=/var/etc/$UCI_CONF_NAME.conf
                fi
        fi
 
@@ -837,7 +833,4 @@ start() {
 stop() {
        SERVICE_PID_FILE="$PID"
        service_stop /usr/sbin/olsrd
-
-       SERVICE_PID_FILE="$PID6"
-       service_stop /usr/sbin/olsrd
 }