mirror/openrc
1
0
Fork 0
mirror of https://github.com/OpenRC/openrc.git synced 2026-01-26 16:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add compatibility mode for s6 support

Browse Source 
In order to avoid breaking things for the 3 users who use the old
s6 support, add compatibility.
When command= is empty and a service directory exists in /var/svc.d,
use that service directory instead of creating it from the service
file data.
This commit is contained in:
Laurent Bercot 2025-11-17 15:59:20 +01:00 committed by navi
parent 39eb8a9da7
commit aa456f3827
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
s6-guide.md
View File

@ -97,23 +97,33 @@ timeout_kill means no SIGKILL will be sent.
## How it works internally, starting with 0.63
If the `command` variable is empty *and* there is a user-provided
service directory in `/var/svc.d` with the same name as the service
being called, then everything works as it did previously: the
`/var/svc.d/foo` service directory is linked into the scan directory,
and that's it: you are in full manual control of your service directory.
You can still use the `timeout_ready` and `timeout_down` variables to
tune OpenRC's behaviour, but the other variables have no impact.
The rest of this section assumes that the `command` variable is not
empty. In that case, you don't need to provide a service directory in
the s6 format: OpenRC will craft one for you.
The first time start() is called, OpenRC uses all the variables in the
service file to build a service directory for s6: a run script, possibly
a notification-fd file, etc. This service directory is then linked into
service file to build a service directory: a run script, possibly a
notification-fd file, etc. This service directory is then linked into
the scan directory and s6-svscan is told to register it and spawn a
s6-supervise process on it.
This means that all the information needed for your service should be
given, declaratively, in your service file (and your configuration file
if you have one). You do not need to build your service directory
yourself anymore, this is done automatically: in true OpenRC fashion,
the service file is the One True Source of information for running
your service.
if you have one). In true OpenRC fashion, the service file is the One
True Source of information for running your service.
The run script for the s6 service directory is built with in the
execline language, because execline makes script generation easier
than sh. However, the daemon execution itself is still done via
sh -c "$command $command_args $command_args_foreground"
`sh -c "$command $command_args $command_args_foreground"`
for compatibility with other backends. In other words: you can forget
that execline is even there, all the user-facing parts use sh as their
interpreter and it's all you need to worry about.

16
sh/s6.sh
View File

@ -79,6 +79,10 @@ _s6_force_stop() {
s6-svunlink -- "$_scandir" "$name"
}
_s6_have_legacy_servicedir() {
test -z "$command" && test -x "/var/svc.d/$name/run"
}
_s6_servicedir_creation_needed() {
local dir="$_servicedirs/$name" conffile="{$RC_SERVICE%/*}/../conf.d/${RC_SERVICE##*/}"
if ! test -e "$dir" ; then
@ -163,21 +167,25 @@ _s6_servicedir_create() {
s6_start()
{
local r waitcommand waitname
local servicepath r waitcommand waitname
_s6_set_variables
if ! _s6_sanity_checks ; then
eerror "s6 sanity checks failed, cannot start service"
return 1
fi
if _s6_servicedir_creation_needed ; then
servicepath="$_servicedirs/$name"
if _s6_have_legacy_servicedir ; then
servicepath="/var/svc.d/$name"
ebegin "Starting $name (via user-provided service directory)"
elif _s6_servicedir_creation_needed ; then
ebegin "Starting $name"
_s6_servicedir_create
else
ebegin "Starting $name (using cached service directory)"
fi
if s6-svlink -- "$_scandir" "$_servicedirs/$name" ; then : ; else
if s6-svlink -- "$_scandir" "$servicepath" ; then : ; else
r=$?
eend $r "Failed to s6-svlink $name into $_scandir"
eend $r "Failed to s6-svlink $servicepath into $_scandir"
return $r
fi
if test -n "$timeout_ready" ; then