aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Booth <colin@heliocat.net>2015-09-14 00:43:42 -0700
committerWilliam Hubbs <w.d.hubbs@gmail.com>2016-01-19 16:52:58 -0600
commit30c3561b6b648d60174a22a73555b680d2cc86fc (patch)
treeec16a72420014a4d93018e8ccb0c797c9f73dc3e
parent5f2850366ea0f30f0f9cb6b129b69192c11e74ac (diff)
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.
-rw-r--r--sh/s6.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/sh/s6.sh b/sh/s6.sh
index 7f378d55..447419ce 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"