From 29100ede694ef8500f2f63211fff3232d3254516 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 19 Jun 2026 03:57:56 +0000
Subject:  Make fdhuser a config variable and --fdholder-user a global option

 And remove the -h|--fdholder-user from various subcommands.
---
 doc/s6.conf.html       |  6 ++++++
 doc/s6_repository.html | 15 ++-------------
 doc/s6_set.html        | 16 ++--------------
 doc/upgrade.html       |  1 -
 4 files changed, 10 insertions(+), 28 deletions(-)

(limited to 'doc')

diff --git a/doc/s6.conf.html b/doc/s6.conf.html
index 39b1e76..8120603 100644
--- a/doc/s6.conf.html
+++ b/doc/s6.conf.html
@@ -99,6 +99,12 @@ The default is <tt>/usr/share/s6/sources:/etc/s6/sources</tt>
 terse (only print fatal error messages), 1 is normal (print error messages and warnings),
 over 1 is increasingly verbose (print informational messages, up to tracing and debug
 messages at level 4-5). The default is <strong>1</strong>. </dd>
+
+<dt> fdhuser </dt>
+<dd> The system user for the internal fd-holding process spawned by
+s6-rc. It must be a user defined in <tt>/etc/passwd</tt>.
+The default is <strong>root</strong> and that is fine, but distributions
+may want to set it to an unprivileged user. </dd>
 </dl>
 
 </body>
diff --git a/doc/s6_repository.html b/doc/s6_repository.html
index d9cfcc9..bda22b2 100644
--- a/doc/s6_repository.html
+++ b/doc/s6_repository.html
@@ -59,7 +59,7 @@ and usage of the <tt>s6 repository</tt> command. It is not as detailed as this p
 <h4> Interface </h4>
 
 <pre>
-     s6 repository init [ -f ] [ -U ] [ -h <em>fdhuser</em> ]
+     s6 repository init [ -f ] [ -U ]
 </pre>
 
 <ul>
@@ -85,9 +85,6 @@ if the repository seems hopelessly broken. </dd>
 of stores. This commands needs to be run when the storelist variable
 has changed. </dd>
 
-<dt> -h <em>fdhuser</em>, --fdholder-user=<em>fdhuser</em> </dt>
-<dd> Specify the fdholder user for the reference database. This has
-no impact whatsoever and this option can safely be ignored. </dd>
 </dl>
 
 <h3 id="list"> list </h3>
@@ -154,7 +151,7 @@ change <tt>B</tt> to be unmasked or enabled as well. </dd>
 <h4> Interface </h4>
 
 <pre>
-     s6 repository sync [ -h <em>fdhuser</em> ]
+     s6 repository sync
 </pre>
 
 <ul>
@@ -166,13 +163,5 @@ that defines a service. Ideally it should be added to a hook defined by
 the package manager. </li>
 </ul>
 
-<h4> Options </h4>
-
-<dl>
-<dt> -h <em>fdhuser</em>, --fdholder-user=<em>fdhuser</em> </dt>
-<dd> Specify the fdholder user for the reference database. This has
-no impact whatsoever and this option can safely be ignored. </dd>
-</dl>
-
 </body>
 </html>
diff --git a/doc/s6_set.html b/doc/s6_set.html
index a38a57d..683cbad 100644
--- a/doc/s6_set.html
+++ b/doc/s6_set.html
@@ -298,7 +298,7 @@ change <tt>B</tt> to be unmasked or enabled as well. </dd>
 <h4> Interface </h4>
 
 <pre>
-     s6 set commit [ -f ] [ -K ] [ -D <em>defaultbundle</em> ] [ -h <em>fdhuser</em> ] [ -s <em>setname</em> ]
+     s6 set commit [ -f ] [ -K ] [ -D <em>defaultbundle</em> ] [ -s <em>setname</em> ]
 </pre>
 
 <ul>
@@ -333,12 +333,6 @@ services and that will be started at boot time. There is generally no reason
 to change the default, which depends on the distribution and is probably called
 <tt>default</tt>. </dd>
 
-<dt> -h <em>fdhuser</em>, --fdholder-user=<em>fdhuser</em> </dt>
-<dd> Specify the fdholder user for the compiled database built from
-the set. This must be a user name defined in the <tt>/etc/passwd</tt>
-file or whatever user database the system uses. The default is <tt>root</tt>
-and that is fine. </dd>
-
 <dt> <tt>-s <em>setname</em></tt>, <tt>--set=<em>setname</em></tt> </dt>
 <dd> Commit the set named <em>setname</em>, rather than <tt>current</tt>. </dd>
 </dl>
@@ -348,7 +342,7 @@ and that is fine. </dd>
 <h4> Interface </h4>
 
 <pre>
-     s6 set apply [ -b ]  [ -D <em>defaultbundle</em> ] [ -h <em>fdhuser</em> ] [ -s <em>setname</em> ] [ -t <em>timeout</em> ]
+     s6 set apply [ -b ]  [ -D <em>defaultbundle</em> ] [ -s <em>setname</em> ] [ -t <em>timeout</em> ]
 </pre>
 
 <ul>
@@ -378,12 +372,6 @@ database. The default is to fail with an error message instead. </dd>
 services, which will be the ones running on the machine when the command ends.
 The default depends on the distribution and is probably called <tt>default</tt>. </dd>
 
-<dt> -h <em>fdhuser</em>, --fdholder-user=<em>fdhuser</em> </dt>
-<dd> Specify the fdholder user for the compiled database built from
-the set. This must be a user name defined in the <tt>/etc/passwd</tt>
-file or whatever user database the system uses. The default is <tt>root</tt>
-and that is fine. </dd>
-
 <dt> <tt>-f <em>convfile</em></tt>, <tt>--conversion-file=<em>convfile</em></tt> </dt>
 <dd> Use <em>convfile</em> as a <a href="//skarnet.org/software/s6-rc/s6-rc-update.html#conversion">conversion file</a> for the underlying
 <a href="//skarnet.org/software/s6-rc/s6-rc-update.html">s6-rc-update</a>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index db8801b..545e2e9 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -22,7 +22,6 @@
 <h2> in 0.1.0.0 </h2>
 
 <ul>
- <li> Support for disabling RPATH at configure time. </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
 dependency bumped to 2.15.0.1. </li>
  <li> <a href="//skarnet.org/software/nsss/">nsss</a>
-- 
cgit v1.3.1