olsrd: make respawn_threshold configurable

Also make respawn_threshold configurable. Further, add default
values for:
- respawn_threshold 3600
- respawn_timeout 15
- respawn_retry 0

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 775d030a58c90f6cf8105823da03d36654012fc2)

diff --git a/olsrd/files/olsrd.config b/olsrd/files/olsrd.config
index 25812fa4ffde9fecb08a3094fc875100750c1d6c..483ce1a5c5d8d46104be0aa4886dc40923f697cf 100644 (file)
--- a/olsrd/files/olsrd.config
+++ b/olsrd/files/olsrd.config
@@ -24,5 +24,6 @@ config Interface
        list interface 'wlan'
 
 config procd general
+       option respawn_threshold '3600'
        option respawn_timeout '15'
        option respawn_retry '0'

diff --git a/olsrd/files/olsrd4.init b/olsrd/files/olsrd4.init
index 03836eb3462c5a2cdcae3d022ba74dec6c4f11a6..67f6957369eb92228ce61bbd801219427e149eba 100644 (file)
--- a/olsrd/files/olsrd4.init
+++ b/olsrd/files/olsrd4.init
@@ -28,19 +28,21 @@ start_service() {
        procd_open_instance
 
        config_load olsrd
+       local _respawn_threshold
        local _respawn_timeout
        local _respawn_retry
-       
-       config_get _respawn_timeout general respawn_timeout     
-       config_get _respawn_retry general respawn_retry         
-       
+
+       config_get _respawn_threshold general respawn_threshold 3600
+       config_get _respawn_timeout general respawn_timeout 15
+       config_get _respawn_retry general respawn_retry 0
+
        procd_set_param command "$BIN"
        procd_append_param command -f ${CONF}
        procd_append_param command -nofork
        procd_append_param command -pidfile ${PID}
 
        # restart if olsrd dies
-       procd_set_param respawn 3600 $_respawn_timeout $_respawn_retry
+       procd_set_param respawn $_respawn_threshold $_respawn_timeout $_respawn_retry
 
        # automatically restart olsrd if generated cfg has changed
        procd_set_param file $CONF

diff --git a/olsrd/files/olsrd6.config b/olsrd/files/olsrd6.config
index 57ae69813094076be59434514d5692fabeee64bf..9721a84bea3034aead81c77a2a6d48858aa07fa1 100644 (file)
--- a/olsrd/files/olsrd6.config
+++ b/olsrd/files/olsrd6.config
@@ -11,5 +11,6 @@ config Interface
        list interface 'wlan'
 
 config procd general
+       option respawn_threshold '3600'
        option respawn_timeout '15'
        option respawn_retry '0'

diff --git a/olsrd/files/olsrd6.init b/olsrd/files/olsrd6.init
index 77b68e80b93b17146bf2508e844256e308a8e249..fd7eb5e14ef2ab6542018df9f77137b9e391e4bb 100644 (file)
--- a/olsrd/files/olsrd6.init
+++ b/olsrd/files/olsrd6.init
@@ -28,11 +28,13 @@ start_service() {
        procd_open_instance
 
        config_load olsrd6
+       local _respawn_threshold
        local _respawn_timeout
        local _respawn_retry
 
-       config_get _respawn_timeout general respawn_timeout     
-       config_get _respawn_retry general respawn_retry                 
+       config_get _respawn_threshold general _respawn_threshold 3600
+       config_get _respawn_timeout general respawn_timeout 15
+       config_get _respawn_retry general respawn_retry 0
 
        procd_set_param command "$BIN"
        procd_append_param command -f ${CONF}
@@ -40,7 +42,7 @@ start_service() {
        procd_append_param command -pidfile ${PID}
 
        # restart if olsrd dies
-       procd_set_param respawn 3600 $_respawn_timeout $_respawn_retry
+       procd_set_param respawn $_respawn_threshold $_respawn_timeout $_respawn_retry
 
        # automatically restart olsrd if generated cfg has changed
        procd_set_param file $CONF