From 07e3d69c52c44fd4953db1c7ef3431b053e3f775 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Tue, 4 Dec 2007 16:15:32 +0000
Subject: Our default start command should correctly recover on failed
 re-entrant services

---
 sh/runscript.sh | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/sh/runscript.sh b/sh/runscript.sh
index 641febcf..9ad22d45 100755
--- a/sh/runscript.sh
+++ b/sh/runscript.sh
@@ -109,20 +109,29 @@ unset _f
 if [ -n "${command}" ]; then
 	if ! type start >/dev/null 2>&1; then
 		start() {
+			local _background=
 			ebegin "Starting ${name:-${SVCNAME}}"
-			case "${command_background}" in
-				[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-					start_stop_daemon_args="${start_stop_daemon_args} --background --pidfile"
-					;;
-			esac
-			yesno "${start_inactive}" && mark_service_inactive "${SVCNAME}"
+			if yesno "${command_background}"; then 
+				_background="--background --pidfile"
+			fi
+			if yesno "${start_inactive}"; then
+				local _inactive=false
+				service_inactive "${SVCNAME}" && _inactive=true
+				mark_service_inactive "${SVCNAME}"
+			fi
 			start-stop-daemon --start \
 				--exec ${command} \
 				${procname:+--name} ${procname} \
 				${pidfile:+--pidfile} ${pidfile} \
-				${start_stop_daemon_args} \
+				${_background} ${start_stop_daemon_args} \
 				-- ${command_args}
-			eend $? "Failed to start ${SVCNAME}"
+			eend $? "Failed to start ${SVCNAME}" && return 0
+			if yesno "${start_inactive}"; then
+				if ! ${_inactive}; then
+			   		mark_service_stopped "${SVCNAME}"
+				fi
+			fi
+			return 1
 		}
 	fi
 fi
-- 
cgit v1.2.3