about summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-04-23 15:32:59 +0000
committerLaurent Bercot <ska@appnovation.com>2023-04-23 15:32:59 +0000
commitf00e8927b57014a6627460104d9dd00efbd239f0 (patch)
tree124d63b12b05a37d7eadc7766d55461fcfef28a3 /doc
parent9f87783018ca824019413132e099f696af9e44d3 (diff)
downloads6-f00e8927b57014a6627460104d9dd00efbd239f0.tar.gz
s6-f00e8927b57014a6627460104d9dd00efbd239f0.tar.xz
s6-f00e8927b57014a6627460104d9dd00efbd239f0.zip
adjust unit-conversion.html
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/unit-conversion.html15
1 files changed, 12 insertions, 3 deletions
diff --git a/doc/unit-conversion.html b/doc/unit-conversion.html
index 09d5670..0292dda 100644
--- a/doc/unit-conversion.html
+++ b/doc/unit-conversion.html
@@ -26,7 +26,7 @@ parsing a set of <a href="https://man7.org/linux/man-pages/man5/systemd.unit.5.h
 unit files</a> and outputting a set of <a href="servicedir.html">s6
 service directories</a> or
 <a href="//skarnet.org/software/s6-rc/s6-rc-compile.html#source">s6-rc service
-definition directories</a> would be extremely useful to people who want to migrate to
+definition directories</a> would be useful to people who want to migrate to
 s6 but have an existing base of services running under systemd.
 </p>
 
@@ -49,7 +49,7 @@ theoretically supported directives: most services that run under systemd can be
 converted to run under s6 without too much trouble. So, depending on the exact
 nature of the set of services, it may be possible to write a reasonable converter,
 that is limited in what it supports but does not require a full understanding
-of systemd or s6.
+of systemd (or even s6).
 </p>
 
 <p>
@@ -74,6 +74,13 @@ the systemd-managed system holistically and outputs an equivalent system
 managed by s6, but in practice nobody's ever going to write such a tool.
 </p>
 
+<p>
+ We only address directives that can appear in <em>service units</em>, which
+are the ones that can reasonably be expected to translate to s6 or s6-rc
+services. We do not address directives that can only appear in other kinds
+of unit files such as slices, timers, sockets, etc.
+</p>
+
 <hr />
 
 <ul>
@@ -109,6 +116,7 @@ systemd documentation, with their difficulty</a>
     </ul>
    </li>
    <li> <a href="#systemd.kill">in systemd.kill(5)</a> </li>
+   <li> <a href="#systemd.resource-control">in systemd.resource-control(5)</a> </li>
   </ul>
  </li>
  <li>
@@ -364,7 +372,7 @@ a bundle. </li>
 does not involve restarting the service does not need the service manager as
 a third-party. systemd cannot help inserting itself where it does not belong. </li>
  <p />
- <li> <tt>ExecStop=</tt>&nbsp;: <strong>6</strong>. s6 only supports terminating
+ <li> <tt>ExecStop=</tt>&nbsp;: <strong>5</strong>. s6 only supports terminating
 services via signals, so if a service needs a specific command to be stopped,
 the converter needs to target an interface layer on top of s6 with a repository
 of stop commands; such a layer would likely need to be on top of s6-rc as well
@@ -1247,6 +1255,7 @@ cgroups-related resource control directives.
  <li> <tt>RebootArgument=</tt> </li>
  <li> <tt>Type=dbus</tt> </li>
  <li> <tt>BusName=</tt> </li>
+ <li> <tt>ExecStop=</tt> </li>
  <li> <tt>NonBlocking=</tt> </li>
  <li> <tt>Sockets=</tt> </li>
  <li> <tt>DynamicUser=</tt> </li>