From 8eb000d3d22fcf7850b43f75ed52068693430d3b Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Fri, 19 Jun 2026 02:29:06 +0000 Subject: Add s6 set apply and s6 apply --- doc/overview.html | 5 +++-- doc/s6.html | 1 + doc/s6_set.html | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/overview.html b/doc/overview.html index 84a81e1..f7f2c87 100644 --- a/doc/overview.html +++ b/doc/overview.html @@ -303,8 +303,9 @@ changes effective, the user needs to run s6 set commit then openrc sysinit && openrc boot && openrc default s6 system boot - The existence of the sysinit and boot runlevels are a -historical wart that OpenRC still has to deal with; s6-frontend does not. + The sysinit and boot runlevels in OpenRC are only distinct +for historical reasons. s6-frontend does not make the distinction, all the services it +starts at boot time are in the default bundle. reboot diff --git a/doc/s6.html b/doc/s6.html index 0f6fc39..f148a23 100644 --- a/doc/s6.html +++ b/doc/s6.html @@ -232,6 +232,7 @@ The details are available here.
  • s6 start is a shortcut for s6 live start.
  • s6 stop is a shortcut for s6 live stop.
  • s6 kill is a shortcut for s6 process kill.
    • +
  • s6 apply is a shortcut for s6 set apply.

    • Notes

    diff --git a/doc/s6_set.html b/doc/s6_set.html index bd74233..a38a57d 100644 --- a/doc/s6_set.html +++ b/doc/s6_set.html @@ -343,5 +343,62 @@ and that is fine.
    Commit the set named setname, rather than current.
    +

    apply

    + +

    Interface

    + +
    +     s6 set apply [ -b ]  [ -D defaultbundle ] [ -h fdhuser ] [ -s setname ] [ -t timeout ]
+
    + + + +

    Options

    + +
    +
    -b, --block
    +
    Block if something is currently holding the lock on the live service +database. The default is to fail with an error message instead.
    + +
    -D defaultbundle, --default-bundle=defaultbundle
    +
    The name of the bundle that holds all active and always +services, which will be the ones running on the machine when the command ends. +The default depends on the distribution and is probably called default.
    + +
    -h fdhuser, --fdholder-user=fdhuser
    +
    Specify the fdholder user for the compiled database built from +the set. This must be a user name defined in the /etc/passwd +file or whatever user database the system uses. The default is root +and that is fine.
    + +
    -f convfile, --conversion-file=convfile
    +
    Use convfile as a conversion file for the underlying +s6-rc-update +invocation. This option should +never be necessary if the services in the stores are properly managed.
    + +
    -s setname, --set=setname
    +
    Apply the set named setname, rather than current.
    + +
    -t timeout, --timeout=timeout
    +
    If installing the set and resetting the state still hasn't completed after timeout +milliseconds, stop waiting and don't attempt to perform the remaining +transitions. By default, timeout is 0, meaning infinite: the +command will wait until the task is complete.
    +
    + -- cgit v1.3.1