commit: 30c3561b6b648d60174a22a73555b680d2cc86fc Author: Colin Booth <colin <AT> heliocat <DOT> net> AuthorDate: Mon Sep 14 07:43:42 2015 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Tue Jan 19 22:52:58 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=30c3561b
sh/s6.sh: update s6-svc syntax to be valid for 2.2.0.0+ The s6-svc syntax changed for wait-up, wait-ready, wait-down, and wait-finished. This changes the s6 handling script to use the current valid syntax. This fixes #65. sh/s6.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sh/s6.sh b/sh/s6.sh index 7f378d5..447419c 100644 --- a/sh/s6.sh +++ b/sh/s6.sh @@ -41,7 +41,7 @@ s6_stop() fi s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}" ebegin "Stopping ${name:-$RC_SVCNAME}" - s6-svc -Dd -T ${s6_service_timeout_stop:-10000} "${s6_service_link}" + s6-svc -wD -d -T ${s6_service_timeout_stop:-10000} "${s6_service_link}" set -- $(s6-svstat "${s6_service_link}") [ "$1" = "down" ] eend $? "Failed to stop $RC_SVCNAME"