emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix carrier_timeout

Browse Source
This commit is contained in:
Roy Marples 2007-04-30 13:17:28 +00:00
parent 3a5f03911a
commit d658c2dc6d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sh/net.sh
View File

@ -59,10 +59,13 @@ _wait_for_carrier() {
_has_carrier && return 0
eval timeout=\$carrier_timeout_${IF_VAR}
timeout=${timeout:-5}
eval timeout=\$carrier_timeout_${IFVAR}
timeout=${timeout:-${carrier_timeout:-5}}
[ -n "${RC_EBUFFER}" ] && efunc=einfo
# Incase users don't want this nice feature ...
[ ${timeout} -le 0 ] && return 0
[ -n "${RC_EBUFFER}" -o "${RC_PREFIX}" = "yes" ] && efunc=einfo
${efunc} "Waiting for carrier (${timeout} seconds) "
while [ ${timeout} -gt 0 ] ; do
sleep 1
@ -72,10 +75,10 @@ _wait_for_carrier() {
return 0
fi
timeout=$((${timeout} - 1))
[ -z "${RC_EBUFFER}" ] && printf "."
[ -z "${RC_EBUFFER}" -a "${RC_PREFIX}" != "yes" ] && printf "."
done
[ -z "${RC_EBUFFER}" ] && echo
[ -z "${RC_EBUFFER}" -a "${RC_PREFIX}" != "yes" ] && echo
eend 1
return 1
}