emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for the s6 supervision suite

Browse Source
This commit is contained in:
William Hubbs
2015-05-11 18:07:28 -05:00
parent 0f9354becf
commit bb2d7becfd
7 changed files with 151 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sh/Makefile
View File

@@ -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

4
sh/openrc-run.sh.in
View File

@@ -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

46
sh/s6.sh Normal file
View File

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