diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2015-05-11 18:07:28 -0500 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2015-05-11 18:36:49 -0500 |
| commit | bb2d7becfd3008379f8f69b5d036922281aa211f (patch) | |
| tree | e7eedb5430c84119dded882f8398d39b301c25e6 /sh | |
| parent | 0f9354becfbd54f9800c93092aa26be859dcf16a (diff) | |
Add support for the s6 supervision suite
Diffstat (limited to 'sh')
| -rw-r--r-- | sh/Makefile | 2 | ||||
| -rw-r--r-- | sh/openrc-run.sh.in | 4 | ||||
| -rw-r--r-- | sh/s6.sh | 46 |
3 files changed, 51 insertions, 1 deletions
diff --git a/sh/Makefile b/sh/Makefile index 3f8881e8..b9b9fb33 100644 --- a/sh/Makefile +++ b/sh/Makefile @@ -1,7 +1,7 @@ DIR= ${LIBEXECDIR}/sh SRCS= init.sh.in functions.sh.in gendepends.sh.in \ openrc-run.sh.in rc-functions.sh.in tmpfiles.sh.in ${SRCS-${OS}} -INC= rc-mount.sh functions.sh rc-functions.sh start-stop-daemon.sh +INC= rc-mount.sh functions.sh rc-functions.sh s6.sh start-stop-daemon.sh BIN= gendepends.sh init.sh openrc-run.sh tmpfiles.sh ${BIN-${OS}} INSTALLAFTER= _installafter diff --git a/sh/openrc-run.sh.in b/sh/openrc-run.sh.in index 67e47b75..33dc59c5 100644 --- a/sh/openrc-run.sh.in +++ b/sh/openrc-run.sh.in @@ -132,6 +132,7 @@ start() { local func=ssd_start case "$supervisor" in + s6) func=s6_start ;; ?*) ewarn "Invalid supervisor, \"$supervisor\", using start-stop-daemon" ;; @@ -143,6 +144,7 @@ stop() { local func=ssd_stop case "$supervisor" in + s6) func=s6_stop ;; ?*) ewarn "Invalid supervisor, \"$supervisor\", using start-stop-daemon" ;; @@ -154,6 +156,7 @@ status() { local func=ssd_status case "$supervisor" in + s6) func=s6_status ;; ?*) ewarn "Invalid supervisor, \"$supervisor\", using start-stop-daemon" ;; @@ -183,6 +186,7 @@ unset _conf_d sourcex -e "@SYSCONFDIR@/rc.conf" # load service supervisor functions +sourcex "@LIBEXECDIR@/sh/s6.sh" sourcex "@LIBEXECDIR@/sh/start-stop-daemon.sh" # Set verbose mode diff --git a/sh/s6.sh b/sh/s6.sh new file mode 100644 index 00000000..780beab2 --- /dev/null +++ b/sh/s6.sh @@ -0,0 +1,46 @@ +# Start / stop / status functions for s6 support +# Copyright (c) 2015 William Hubbs <w.d.hubbs@gmail.com> +# Released under the 2-clause BSD license. + +[ -z "${s6_service_path}" ] && s6_service_path="/etc/svc.d/${RC_SVCNAME}" + +s6_start() +{ + if [ ! -d "${s6_service_path}" ]; then + eerror "${s6_service_path} does not exist." + return 1 + fi + local rc + ebegin "Starting ${name:-$RC_SVCNAME}" + ln -sf "${s6_service_path}" "${RC_SVCDIR}"/s6-scan + s6-svscanctl -an "${RC_SVCDIR}"/s6-scan + rc=$? + if [ -n "$s6_svwait_options_start" ]; then + s6-svwait ${s6_svwait_options_start} "${s6_service_path}" + rc=$? + fi + eend $rc "Failed to start $RC_SVCNAME" +} + +s6_stop() +{ + if [ ! -d "${s6_service_path}" ]; then + eerror "${s6_service_path} does not exist." + return 1 + fi + local rc + ebegin "Stopping ${name:-$RC_SVCNAME}" + rm -rf "${RC_SVCDIR}/s6-scan/${s6_service_path##*/}" + s6-svscanctl -an "${RC_SVCDIR}"/s6-scan + rc=$? + if [ -n "$s6_svwait_options_stop" ]; then + s6-svwait ${s6_svwait_options_stop} "${s6_service_path}" + rc=$? + fi + eend $rc "Failed to stop $RC_SVCNAME" +} + +s6_status() +{ + s6-svstat "${s6_service_path}" +} |