From: Nick Hainke <vincent@systemli.org>
Date: Sun, 1 Aug 2021 08:22:49 +0000 (+0200)
Subject: olsrd: make respawn_threshold configurable
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e93c57981df8a8194ea8efd126e5a59124d7456b;p=feed%2Frouting.git

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 25812fa..483ce1a 100644
--- 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 03836eb..67f6957 100644
--- 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 57ae698..9721a84 100644
--- 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 77b68e8..fd7eb5e 100644
--- 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