aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2026-04-09 13:47:44 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2026-04-09 13:47:44 +0000
commitfacc1fb44783a1c66070403ae70343b1ab9858ee (patch)
tree7a29ffe6277292dede6608a1b00f647eebba2e0f
parent48ada8ebe9cea0446e7c3c8490c99ac5eb9d87a0 (diff)
downloads6-facc1fb44783a1c66070403ae70343b1ab9858ee.tar.gz
Correct the doc update >.>
-rw-r--r--doc/s6-notify-fd-from-socket.html5
-rw-r--r--doc/s6-notify-socket-from-fd.html10
2 files changed, 8 insertions, 7 deletions
diff --git a/doc/s6-notify-fd-from-socket.html b/doc/s6-notify-fd-from-socket.html
index a6ab880..e22a04a 100644
--- a/doc/s6-notify-fd-from-socket.html
+++ b/doc/s6-notify-fd-from-socket.html
@@ -110,6 +110,11 @@ protocol that you want to run under s6. If you want to do the opposite, i.e.
run under systemd a daemon that uses the s6 notification protocol, use the
<a href="s6-notify-socket-from-fd.html">s6-notify-socket-from-fd</a> program
instead. </li>
+ <li> Despite <em>building</em> on every OS supported by s6,
+<tt>s6-notify-fd-from-socket</tt> will only <em>work</em> on systems implementing
+abstract sockets with autobind, which in practice means Linux 2.3.15 and later.
+Other systems do not have systemd anyway, so services should choose other
+notification mechanisms. </li>
</ul>
</body>
diff --git a/doc/s6-notify-socket-from-fd.html b/doc/s6-notify-socket-from-fd.html
index 452cdb4..a1f68d2 100644
--- a/doc/s6-notify-socket-from-fd.html
+++ b/doc/s6-notify-socket-from-fd.html
@@ -21,7 +21,7 @@
<p>
<tt>s6-notify-socket-from-fd</tt> is different from other chainloading
-tools in s6, in as it's not meant to be used in s6 run scripts. Instead,
+tools in s6: it's not meant to be used in s6 run scripts. Instead,
it's meant to be used when you're <em>not</em> using s6, but another
service manager that does not support the
<a href="notifywhenup.html">s6 readiness notification protocol</a>,
@@ -119,12 +119,8 @@ not using the systemd notification protocol, normally has no use for it. </dd>
<li> <tt>s6-notify-socket-from-fd</tt> sends its notification as a subprocess
with a different pid from <em>prog</em>, so the unit file running the service
needs the <tt>NotifyAccess=all</tt> directive. </li>
- <li> Despite <em>building</em> on every OS supported by s6,
-<tt>s6-notify-socket-from-fd</tt> will only <em>work</em> on systems implementing
-abstract sockets with autobind, which in practice means Linux 2.3.15 and later.
-This is okay, because it is only useful to systemd users. </li>
- <li> This program was previously available on skarnet.org outside of any
-package, under the name <tt>sdnotify-wrapper</tt>. </li>
+ <li> An early version of this program was previously available on skarnet.org,
+unpackaged, under the name <tt>sdnotify-wrapper</tt>. </li>
<li> <tt>s6-notify-socket-from-fd</tt> is for s6-style daemons that you
want to run under systemd. If you want to do the opposite, i.e. run under
s6 a daemon that uses the systemd protocol, use the