Attachment #81043 for bug #109803




	checkconfig || return $?

	ebegin "Setting clock via the NTP client '${NTPCLIENT_CMD}'"
	
	if [ "${NTPCLIENT_CMD}" == "ntpdate" ]
	then
		${NTPCLIENT_CMD} ${NTPCLIENT_OPTS} >/dev/null
		eend $? "Failed to set clock"
	else
		${NTPCLIENT_CMD} ${NTPCLIENT_OPTS} >/dev/null &
		local pid=$!
		(sleep ${NTPCLIENT_TIMEOUT:-30}; kill -9 ${pid} >&/dev/null) &
		wait ${pid}
		eend $? "Failed to set clock"
	fi
}

Return to bug 109803

Lines 27-35 Link Here

(-)ntp-client.rc (-5 / +12 lines)
27	checkconfig \|\| return $?	27	checkconfig \|\| return $?
28		28
29	ebegin "Setting clock via the NTP client '${NTPCLIENT_CMD}'"	29	ebegin "Setting clock via the NTP client '${NTPCLIENT_CMD}'"
30	${NTPCLIENT_CMD} ${NTPCLIENT_OPTS} >/dev/null &	30
31	local pid=$!	31	if [ "${NTPCLIENT_CMD}" == "ntpdate" ]
32	(sleep ${NTPCLIENT_TIMEOUT:-30}; kill -9 ${pid} >&/dev/null) &	32	then
33	wait ${pid}	33	${NTPCLIENT_CMD} ${NTPCLIENT_OPTS} >/dev/null
34	eend $? "Failed to set clock"	34	eend $? "Failed to set clock"
		35	else
		36	${NTPCLIENT_CMD} ${NTPCLIENT_OPTS} >/dev/null &
		37	local pid=$!
		38	(sleep ${NTPCLIENT_TIMEOUT:-30}; kill -9 ${pid} >&/dev/null) &
		39	wait ${pid}
		40	eend $? "Failed to set clock"
		41	fi
35	}	42	}