diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2026-09-08 16:12:24 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2026-09-08 16:12:24 +0000 |
| commit | 5eefb9aae5e9e88b200ff7fcc445120c5ee2998b (patch) | |
| tree | aa0bc83b0b5a86dd9a1aab781f36f2c85c8a6b5c /doc/s6.html | |
| parent | 125cf07d0b5139476b1f25fa4ba5a0782818eacc (diff) | |
| download | s6-frontend-5eefb9aae5e9e88b200ff7fcc445120c5ee2998b.tar.gz | |
Improve user service management
- Separate /etc/s6.conf from /etc/s6-user.conf
- Have --system|--user handled at the s6 level, not the s6-frontend level
- Also have --help rewritten at the s6 level because it's cleaner
- On --user, process the config file with sed to import XDG variables
- Do not use s6f_user_get_confdirs() anymore (can remove it if we
decide to stick with this design), --user now only changes the
conf file, and only command-line options such as --scandir can override
what is described in the conf file.
- Document the current behaviour.
Diffstat (limited to 'doc/s6.html')
| -rw-r--r-- | doc/s6.html | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/doc/s6.html b/doc/s6.html index 661bc65..9fb6038 100644 --- a/doc/s6.html +++ b/doc/s6.html @@ -63,17 +63,6 @@ command, and on the linked documentation page you can find the interpretation of its various exit codes. </p> -<h2 id="env"> Environment variables </h2> - -<ul> - <li> s6 reads the <code>S6_CONF</code> environment variable -containing the absolute path to the -<a href="s6.conf.html">configuration file</a> for the s6 command. </li> - <li> If this variable is unset, the default is <tt>/etc/s6.conf</tt>, -possibly overridden by the <tt>--conffile</tt> build-time configure option to -s6-frontend. </li> -</ul> - <h2 id="options"> Global options </h2> <p> @@ -129,12 +118,18 @@ if <tt>auto</tt>. Not all commands and subcommands will use this setting. Also, for pretty-printing of columns, it is recommended to have built s6-frontend with util-linux support. </dd> + <dt> <tt>-S</tt>, <tt>--system</tt> </dt> + <dd> Use the <tt>/etc/s6.conf</tt> system <a href="s6.conf.html">configuration file</tt>. +This is the default. +The location of the file can be overridden by the admin at install time via the +<tt>--conffile</tt> configure option, or by the user at run time via the +<tt>S6_CONF</tt> environment variable. </dd> + <dt> <tt>-u</tt>, <tt>--user</tt> </dt> - <dd> Override the variables defined in the configuration file with values -built from XDG environment variables. This option only works if the XDG -environment variables are present in the environment. This option is -useful to address user services. You can see what values are used by -running <tt>s6 -u version export</tt>. </dd> + <dd> Use the <tt>/etc/s6-user.conf</tt> system <a href="s6.conf.html">configuration file</tt>. +The location of the file can be overridden by the admin at install time via the +<tt>--userconffile</tt> configure option, or by the user at run time via the +<tt>S6_USER_CONF</tt> environment variable. </dd> </dl> |