Attachment #101886 for bug #154670

View | Details | Raw Unified | Return to bug 154670
Collapse All | Expand All

Lines 82-88 Link Here

(-)net.Linux/netplugd.sh (-1 / +1 lines)
82	ewarn $"WARNING: infinite timeout set for" "${iface}" $"to come up"	82	ewarn $"WARNING: infinite timeout set for" "${iface}" $"to come up"
83	elif [[ ${timeout} -lt 0 ]] ; then	83	elif [[ ${timeout} -lt 0 ]] ; then
84	einfo $"Backgrounding ..."	84	einfo $"Backgrounding ..."
85	exit 0	85	exit -1
86	fi	86	fi
87		87
88	veinfo $"Waiting for" "${iface}" $"to be marked as started"	88	veinfo $"Waiting for" "${iface}" $"to be marked as started"

Lines 103-109 Link Here

(-)net.Linux/ifplugd.sh (-1 / +1 lines)
103	ewarn $"WARNING: infinite timeout set for" "${iface}" $"to come up"	103	ewarn $"WARNING: infinite timeout set for" "${iface}" $"to come up"
104	elif [[ ${timeout} -lt 0 ]] ; then	104	elif [[ ${timeout} -lt 0 ]] ; then
105	einfo $"Backgrounding ..."	105	einfo $"Backgrounding ..."
106	exit 0	106	exit -1
107	fi	107	fi
108		108
109	veinfo $"Waiting for" "${iface}" $"to be marked as started"	109	veinfo $"Waiting for" "${iface}" $"to be marked as started"

Lines 212-218 Link Here

(-)net.Linux/pppd.sh (-1 / +1 lines)
212	fi	212	fi
213		213
214	# pppd will re-call us when we bring the interface up	214	# pppd will re-call us when we bring the interface up
215	exit 0	215	exit -1
216	}	216	}
217		217
218	# bool pppd_stop(char *iface)	218	# bool pppd_stop(char *iface)

Lines 128-134 Link Here

(-)net/wpa_supplicant.sh (-1 / +1 lines)
128	ewarn $"WARNING: infinite timeout set for association on" "${iface}"	128	ewarn $"WARNING: infinite timeout set for association on" "${iface}"
129	elif [[ ${timeout} -lt 0 ]] ; then	129	elif [[ ${timeout} -lt 0 ]] ; then
130	einfo $"Backgrounding ..."	130	einfo $"Backgrounding ..."
131	exit 0	131	exit -1
132	fi	132	fi
133		133
134	local i=0	134	local i=0




		# Needed for ebuffer
		eoutdent 99999

		# If a service is returns -1 we deem it inactive
		if [[ ${retval} == "-1" ]] ; then
		if [[ ${retval} == "0" ]] && service_inactive "${SVCNAME}" ; then
			svcinactive=0
			return 0
		fi

		# Needed for ebuffer
		eoutdent 99999

		# If a service is returns -1 we deem it inactive
		if [[ ${retval} == "-1" ]] ; then
		if [[ ${retval} == "0" ]] && service_inactive "${SVCNAME}" ; then
			svcinactive=0
			ewarn $"WARNING:" " ${SVCNAME}" $"has started but is inactive"
			if [[ ${RC_PARALLEL_STARTUP} == "yes" && ${RC_QUIET} != "yes" ]] ; then

Return to bug 154670

Lines 311-319 Link Here

(-)sbin/runscript.sh (-6 / +4 lines)
311	# Needed for ebuffer	311	# Needed for ebuffer
312	eoutdent 99999	312	eoutdent 99999
313		313
314	# If a service has been marked inactive, exit now as something	314	# If a service is returns -1 we deem it inactive
315	# may attempt to start it again later	315	if [[ ${retval} == "-1" ]] ; then
316	if [[ ${retval} == "0" ]] && service_inactive "${SVCNAME}" ; then
317	svcinactive=0	316	svcinactive=0
318	return 0	317	return 0
319	fi	318	fi
Lines 493-501 Link Here
493	# Needed for ebuffer	492	# Needed for ebuffer
494	eoutdent 99999	493	eoutdent 99999
495		494
496	# If a service has been marked inactive, exit now as something	495	# If a service is returns -1 we deem it inactive
497	# may attempt to start it again later	496	if [[ ${retval} == "-1" ]] ; then
498	if [[ ${retval} == "0" ]] && service_inactive "${SVCNAME}" ; then
499	svcinactive=0	497	svcinactive=0
500	ewarn $"WARNING:" " ${SVCNAME}" $"has started but is inactive"	498	ewarn $"WARNING:" " ${SVCNAME}" $"has started but is inactive"
501	if [[ ${RC_PARALLEL_STARTUP} == "yes" && ${RC_QUIET} != "yes" ]] ; then	499	if [[ ${RC_PARALLEL_STARTUP} == "yes" && ${RC_QUIET} != "yes" ]] ; then