From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-800027-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 89C79138CCF
	for <garchives@archives.gentoo.org>; Thu, 14 May 2015 19:29:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 4A808E08BA;
	Thu, 14 May 2015 19:29:46 +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 F1C0FE08BA
	for <gentoo-commits@lists.gentoo.org>; Thu, 14 May 2015 19:29:45 +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 D468E340E4D
	for <gentoo-commits@lists.gentoo.org>; Thu, 14 May 2015 19:29:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 18E729BD
	for <gentoo-commits@lists.gentoo.org>; Thu, 14 May 2015 19:29:42 +0000 (UTC)
From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" <williamh@gentoo.org>
Message-ID: <1431631612.a7fcc1e264b035177b4e524a40b27145baa86969.williamh@OpenRC>
Subject: [gentoo-commits] proj/openrc:master commit in: sh/
X-VCS-Repository: proj/openrc
X-VCS-Files: sh/s6.sh
X-VCS-Directories: sh/
X-VCS-Committer: williamh
X-VCS-Committer-Name: William Hubbs
X-VCS-Revision: a7fcc1e264b035177b4e524a40b27145baa86969
X-VCS-Branch: master
Date: Thu, 14 May 2015 19:29:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 6db35828-6067-471d-a37d-f17fcfe6ce25
X-Archives-Hash: 51fe4cfaf1aaf2f8f9845e78103871c4

commit:     a7fcc1e264b035177b4e524a40b27145baa86969
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu May 14 19:26:52 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu May 14 19:26:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=a7fcc1e2

S6: kick the scanner and sleep 1.5 seconds to avoid a race condition

 sh/s6.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sh/s6.sh b/sh/s6.sh
index 99aba3f..a45456a 100644
--- a/sh/s6.sh
+++ b/sh/s6.sh
@@ -13,6 +13,8 @@ s6_start()
 	s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}"
 	ebegin "Starting ${name:-$RC_SVCNAME}"
 	ln -sf "${s6_service_path}" "${s6_service_link}"
+	s6-svscanctl -na "${RC_SVCDIR}"/s6-scan
+	sleep 1.5
 	s6-svc -u "${s6_service_link}"
 	if [ -n "$s6_svwait_options_start" ]; then
 		s6-svwait ${s6_svwait_options_start} "${s6_service_link}"