From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 79F2D138CD3 for ; Mon, 25 May 2015 10:04:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9F25E0897; Mon, 25 May 2015 10:04:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0F72E08A1 for ; Mon, 25 May 2015 10:04:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C6DBC340B92 for ; Mon, 25 May 2015 10:04:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77E7B9FD for ; Mon, 25 May 2015 10:04:19 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1426004089.902d48c8bd46dd67565371cb5d2c84f91ad30b8e.vapier@OpenRC> Subject: [gentoo-commits] proj/netifrc:master commit in: init.d/ X-VCS-Repository: proj/netifrc X-VCS-Files: init.d/net.lo.in X-VCS-Directories: init.d/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 902d48c8bd46dd67565371cb5d2c84f91ad30b8e X-VCS-Branch: master Date: Mon, 25 May 2015 10:04:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: adf705f9-726e-43d3-a232-e1eaeec08257 X-Archives-Hash: 42fe492ebf07829f6104c0f0bb2f3fc9 commit: 902d48c8bd46dd67565371cb5d2c84f91ad30b8e Author: Thomas D whissi de> AuthorDate: Wed Apr 16 09:52:56 2014 +0000 Commit: Mike Frysinger gentoo 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 }