- New -wr | -wR options to s6-svc, s6-svlisten1 and s6-svlisten

 - skalibs and execline dep bump
 - rc for 2.2.1.0 unless more new functionality is needed for s6-rc

1 files changed, 13 insertions, 1 deletions

diff --git a/doc/s6-svc.html b/doc/s6-svc.html
index 86e6857..7c3b2bd 100644
--- a/doc/s6-svc.html
+++ b/doc/s6-svc.html
@@ -28,7 +28,7 @@ knowing their PIDs, and without using horrible hacks such as .pid files.
 <h2> Interface </h2>
 
 <pre>
-     s6-svc [ -wu | -wU | -wd | -wD ] [ -T <em>timeout</em> ] [ -abqhkti12pcoduxO ] <em>servicedir</em>
+     s6-svc [ -wu | -wU | -wd | -wD | -wr | -wR ] [ -T <em>timeout</em> ] [ -abqhkti12pcoduxO ] <em>servicedir</em>
 </pre>
 
 <p>
@@ -89,6 +89,11 @@ a <tt>notification-fd</tt> file to tell
 <a href="s6-supervise.html">s6-supervise</a> to accept readiness
 notification, s6-svc will print a warning and act as if the <tt>-wu</tt>
 option had been given instead. </li>
+ <li> <tt>-wr</tt>&nbsp;: s6-svc will not exit until the service has been
+started or restarted. </li>
+ <li> <tt>-wR</tt>&nbsp;: s6-svc will not exit until the service has been
+started or restarted and has notified readiness. </li>
+
 </ul>
 
 <h2> Usage examples </h2>
@@ -119,6 +124,13 @@ the finish script has completed.
 is ready. Exit 1 if it is still not ready after 5 seconds.
 </p>
 
+<pre> s6-svc -wR -t /service/ftpd </pre>
+<p>
+ Send a SIGTERM to the ftpd server; wait for
+<a href="s6-supervise.html">s6-supervise</a> to restart it, and block
+until it has notified that it is ready to serve again.
+</p>
+
 <pre> s6-svc -a /service/httpd/log </pre>
 <p>
  Send a SIGALRM to the logger process for the httpd server. If this logger