Attachment #361056 for bug #488256

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





_wait_for_carrier()
{
	local timeout=

	_has_carrier  && return 0


	# Incase users don't want this nice feature ...
	[ ${timeout} -le 0 ] && return 0

	einfon "Waiting for carrier (${timeout} seconds) "
	${efunc} "Waiting for carrier (${timeout} seconds) "
	while [ ${timeout} -gt 0 ]; do
		if _has_carrier; then
			echo
			eend 0
			return 0
		fi
		sleep 1
		: $(( timeout -= 1 ))
		printf "."
	done

	echo
	eend 1
	return 1
}
- 

Return to bug 488256

Lines 103-109 _flatten_array() Link Here

(-)a/init.d/net.lo.in (-7 / +5 lines)
103		103
104	_wait_for_carrier()	104	_wait_for_carrier()
105	{	105	{
106	local timeout= efunc=einfon	106	local timeout=
107		107
108	_has_carrier && return 0	108	_has_carrier && return 0
109		109
Lines 113-132 _wait_for_carrier() Link Here
113	# Incase users don't want this nice feature ...	113	# Incase users don't want this nice feature ...
114	[ ${timeout} -le 0 ] && return 0	114	[ ${timeout} -le 0 ] && return 0
115		115
116	yesno ${RC_PARALLEL} && efunc=einfo	116	einfon "Waiting for carrier (${timeout} seconds) "
117	${efunc} "Waiting for carrier (${timeout} seconds) "
118	while [ ${timeout} -gt 0 ]; do	117	while [ ${timeout} -gt 0 ]; do
119	if _has_carrier; then	118	if _has_carrier; then
120	[ "${efunc}" = "einfon" ] && echo	119	echo
121	eend 0	120	eend 0
122	return 0	121	return 0
123	fi	122	fi
124	sleep 1	123	sleep 1
125	: $(( timeout -= 1 ))	124	: $(( timeout -= 1 ))
126	[ "${efunc}" = "einfon" ] && printf "."	125	printf "."
127	done	126	done
128		127
129	[ "${efunc}" = "einfon" ] && echo	128	echo
130	eend 1	129	eend 1
131	return 1	130	return 1
132	}	131	}
133	-