[gentoo-commits] proj/openrc:openrc-0.16.x commit in: sh/

[gentoo-commits] proj/openrc:openrc-0.16.x commit in: sh/

[William Hubbs]

commit:     c65bed756e5f5cfa244d9aa4325691345d8c324d
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed May 13 21:51:55 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed May 13 21:55:34 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=c65bed75

More s6 fixes

- When no service link is in the scan directory, show the default
  stopped message.
- Do not remove the service link when stopping the service.

 sh/s6.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sh/s6.sh b/sh/s6.sh
index 01527b6..a99fd5b 100644
--- a/sh/s6.sh
+++ b/sh/s6.sh
@@ -37,12 +37,16 @@ s6_stop()
 	fi
 	sleep 1.5
 	set -- $(s6-svstat "${s6_service_link}")
-	[ "$1" = "down" ] && rm -fr "${s6_service_link}"
+	[ "$1" = "down" ]
 	eend $? "Failed to stop $RC_SVCNAME"
 }
 
 s6_status()
 {
 	s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}"
-	s6-svstat "${s6_service_link}"
+	if [ -L "${s6_service_link}" ]; then
+		s6-svstat "${s6_service_link}"
+	else
+		_status
+	fi
 }

[gentoo-commits] proj/openrc:openrc-0.16.x commit in: sh/

[William Hubbs]

commit:     fe0847c9a2565518334ef03da5c6cdc63726e122
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:33:30 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=fe0847c9

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}"