From c29368d9e34fee0e2fe0fae2fdf2865580be4ae0 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 28 Aug 2017 08:12:20 +0000
Subject:  Add namespaces support, prepare for 0.3.1.0

---
 doc/index.html               | 12 ++++++------
 doc/s6-linux-init-maker.html | 11 +++++++++++
 doc/upgrade.html             | 15 +++++++++++++++
 3 files changed, 32 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/doc/index.html b/doc/index.html
index 4c1ff7d..dd93276 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -50,15 +50,15 @@ a small FAQ.
  <li> A Linux-based system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.5.0.0 or later </li>
+2.6.0.0 or later </li>
  <li> <a href="//skarnet.org/software/execline/">execline</a> version
-2.3.0.0 or later </li>
+2.3.0.2 or later </li>
  <li> <a href="//skarnet.org/software/s6-portable-utils/">s6-portable-utils</a> version
-2.2.0.0 or later </li>
+2.2.1.1 or later </li>
  <li> <a href="//skarnet.org/software/s6-linux-utils/">s6-linux-utils</a> version
-2.3.0.0 or later </li>
+2.4.0.0 or later </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.5.0.0 or later </li>
+2.6.1.0 or later </li>
 </ul>
 
 <p>
@@ -87,7 +87,7 @@ against the shared version of the skalibs library, it also becomes a
 
 <ul>
  <li> The current released version of s6-linux-init is
-<a href="s6-linux-init-0.3.0.0.tar.gz">0.3.0.0</a>. </li>
+<a href="s6-linux-init-0.3.1.0.tar.gz">0.3.1.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-linux-init/">s6-linux-init
 git repository</a>:
diff --git a/doc/s6-linux-init-maker.html b/doc/s6-linux-init-maker.html
index b7648ed..41d8372 100644
--- a/doc/s6-linux-init-maker.html
+++ b/doc/s6-linux-init-maker.html
@@ -63,6 +63,7 @@ machine</em> - else the scripts will crash.
        [ -d <em>dev_style</em> ] \
        [ -s <em>env_store</em> ] \
        [ -e <em>initial_envvar</em> ] ... \
+       [ -n ] \
        <em>dir</em>
 </pre>
 
@@ -374,6 +375,14 @@ environment, or of the form <em>VAR=VALUE</em>, to add an
 environment variable <em>VAR</em> with the value <em>VALUE</em>.
 The TZ variable, for instance, is a good candidate to be set in
 the global environment. </li> <p />
+
+ <li> <tt>-n</tt>&nbsp;: tells s6-linux-init-maker that the init script
+is going to run in a container, as pid 1 in a non-root namespace.
+This modifies the <tt>.s6-svscan/finish</tt>, <tt>.s6-svscan/SIGHUP</tt>
+and <tt>.s6-svscan/SIGINT</tt> scripts slightly, in order to provide
+adequate functionality when the containerized system is asked to
+shutdown. Do not add this option if the init script is going to run
+in the root pid namespace. </li> <p />
 </ul>
 
 <h2> Notes </h2>
@@ -407,6 +416,8 @@ you could probably invoke
 <a href="//skarnet.org/software/s6/s6-svscan.html">s6-svscan</a>
 directly as your process 1, or build a script by hand, which
 would result in a simpler init with less dependencies.
+Nevertheless, if you prefer using s6-linux-init-maker, it
+supports this case via the <tt>-n</tt> option.
 </p>
 
 </body>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 8108b4d..38e6ac1 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,21 @@
 
 <h1> What has changed in s6-linux-init </h1>
 
+<h2> in 0.3.1.0 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.6.0.0. </li>
+ <li> <a href="//skarnet.org/software/execline/">execline</a>
+dependency bumped to 2.3.0.2. </li>
+ <li> <a href="//skarnet.org/software/s6-portable-utils/">s6-portable-utils</a>
+dependency bumped to 2.2.1.1. </li>
+ <li> <a href="//skarnet.org/software/s6-linux-utils/">s6-linux-utils</a>
+dependency bumped to 2.4.0.0. </li>
+ <li> <a href="//skarnet.org/software/s6/">s6</a>
+dependency bumped to 2.6.1.0. </li>
+</ul>
+
 <h2> in 0.3.0.0 </h2>
 
 <ul>
-- 
cgit v1.3.1