commit: 902d48c8bd46dd67565371cb5d2c84f91ad30b8e Author: Thomas D <whissi <AT> whissi <DOT> de> AuthorDate: Wed Apr 16 09:52:56 2014 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Tue Mar 10 16:14:49 2015 +0000 URL: https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=902d48c8
_wait_for_carrier(): Workaround for output when using rc_parallel="YES" is no longer needed _wait_for_carrier() was using a workaround when rc_parallel is enabled. This caused the following broken output: https://bugs.gentoo.org/attachment.cgi?id=361054 This patch fixes bug 488256 by removing the workaround, because this workaround isn't needed anymore. X-Gentoo-Bug: 488256 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=488256 init.d/net.lo.in | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/init.d/net.lo.in b/init.d/net.lo.in index bdb3747..e883f98 100644 --- a/init.d/net.lo.in +++ b/init.d/net.lo.in @@ -116,7 +116,7 @@ _flatten_array() _wait_for_carrier() { - local timeout= efunc=einfon + local timeout= _has_carrier && return 0 @@ -126,20 +126,19 @@ _wait_for_carrier() # Incase users don't want this nice feature ... [ ${timeout} -le 0 ] && return 0 - yesno ${RC_PARALLEL} && efunc=einfo - ${efunc} "Waiting for carrier (${timeout} seconds) " + einfon "Waiting for carrier (${timeout} seconds) " while [ ${timeout} -gt 0 ]; do if _has_carrier; then - [ "${efunc}" = "einfon" ] && echo + echo eend 0 return 0 fi sleep 1 : $(( timeout -= 1 )) - [ "${efunc}" = "einfon" ] && printf "." + printf "." done - [ "${efunc}" = "einfon" ] && echo + echo eend 1 return 1 }
