[patch] Test on exit -1 instead of service_inactive

x (text/plain), 2.50 KB, created by Roy Marples (RETIRED) on 2006-11-13 16:40:29 UTC

Index: net.Linux/netplugd.sh
===================================================================
--- net.Linux/netplugd.sh	(revision 2381)
+++ net.Linux/netplugd.sh	(working copy)
@@ -82,7 +82,7 @@
 		ewarn $"WARNING: infinite timeout set for" "${iface}" $"to come up"
 	elif [[ ${timeout} -lt 0 ]] ; then
 		einfo $"Backgrounding ..."
-		exit 0
+		exit -1 
 	fi
 
 	veinfo $"Waiting for" "${iface}" $"to be marked as started"
Index: net.Linux/ifplugd.sh
===================================================================
--- net.Linux/ifplugd.sh	(revision 2381)
+++ net.Linux/ifplugd.sh	(working copy)
@@ -103,7 +103,7 @@
 		ewarn $"WARNING: infinite timeout set for" "${iface}" $"to come up"
 	elif [[ ${timeout} -lt 0 ]] ; then
 		einfo $"Backgrounding ..."
-		exit 0
+		exit -1 
 	fi
 
 	veinfo $"Waiting for" "${iface}" $"to be marked as started"
Index: net.Linux/pppd.sh
===================================================================
--- net.Linux/pppd.sh	(revision 2381)
+++ net.Linux/pppd.sh	(working copy)
@@ -212,7 +212,7 @@
 	fi
 
 	# pppd will re-call us when we bring the interface up
-	exit 0
+	exit -1 
 }
 
 # bool pppd_stop(char *iface)
Index: net/wpa_supplicant.sh
===================================================================
--- net/wpa_supplicant.sh	(revision 2381)
+++ net/wpa_supplicant.sh	(working copy)
@@ -128,7 +128,7 @@
 		ewarn $"WARNING: infinite timeout set for association on" "${iface}"
 	elif [[ ${timeout} -lt 0 ]] ; then
 		einfo $"Backgrounding ..."
-		exit 0
+		exit -1 
 	fi
 
 	local i=0
Index: sbin/runscript.sh
===================================================================
--- sbin/runscript.sh	(revision 2382)
+++ sbin/runscript.sh	(working copy)
@@ -311,9 +311,8 @@
 		# Needed for ebuffer
 		eoutdent 99999
 
-		# If a service has been marked inactive, exit now as something
-		# may attempt to start it again later
-		if [[ ${retval} == "0" ]] && service_inactive "${SVCNAME}" ; then
+		# If a service is returns -1 we deem it inactive
+		if [[ ${retval} == "-1" ]] ; then
 			svcinactive=0
 			return 0
 		fi
@@ -493,9 +492,8 @@
 		# Needed for ebuffer
 		eoutdent 99999
 
-		# If a service has been marked inactive, exit now as something
-		# may attempt to start it again later
-		if [[ ${retval} == "0" ]] && service_inactive "${SVCNAME}" ; then
+		# If a service is returns -1 we deem it inactive
+		if [[ ${retval} == "-1" ]] ; then
 			svcinactive=0
 			ewarn $"WARNING:" " ${SVCNAME}" $"has started but is inactive"
 			if [[ ${RC_PARALLEL_STARTUP} == "yes" && ${RC_QUIET} != "yes" ]] ; then