Prepare for 1.1.0.0; remove early utmpd support

Signed-off-by: Laurent Bercot <ska@appnovation.com>

3 files changed, 18 insertions, 36 deletions

diff --git a/doc/index.html b/doc/index.html
index 141bdcb..7d61315 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -73,16 +73,16 @@ kernel command line </li>
  <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.13.0.0 or later. It's a build-time requirement. It's also a run-time
+2.13.1.0 or later. It's a build-time requirement. It's also a run-time
 requirement (for <a href="s6-linux-init-maker.html">s6-linux-init-maker</a>)
 as well as a boot-time requirement (i.e. a run-time requirement for the
 programs used when you boot a system created with
 <a href="s6-linux-init-maker.html">s6-linux-init-maker</a>) if you link
 against the shared version of the skalibs library. </li>
  <li> <a href="//skarnet.org/software/execline/">execline</a> version
-2.9.1.0 or later. It is a build-time and boot-time requirement. </li>
+2.9.2.0 or later. It is a build-time and boot-time requirement. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.11.2.0 or later. It is a build-time and boot-time requirement. </li>
+2.11.3.0 or later. It is a build-time and boot-time requirement. </li>
 </ul>
 
 <p>
@@ -110,7 +110,7 @@ want nsswitch-like functionality:
 
 <ul>
  <li> The current released version of s6-linux-init is
-<a href="s6-linux-init-1.0.8.1.tar.gz">1.0.8.1</a>. </li>
+<a href="s6-linux-init-1.1.0.0.tar.gz">1.1.0.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 00a9722..1390781 100644
--- a/doc/s6-linux-init-maker.html
+++ b/doc/s6-linux-init-maker.html
@@ -61,7 +61,6 @@ machine</em>. If it is not the case, the system will fail to boot.
        [ -D <em>initdefault</em> ] \
        [ -n | -N ] \
        [ -f <em>skeldir</em> ] \
-       [ -U <em>utmp_user</em> ] \
        [ -C ] \
        [ -B ] \
        [ -S ] \
@@ -320,20 +319,6 @@ build time. This option is typically useful when distributions run
 <tt>s6-linux-init-maker</tt> in packaging scripts, when preparing
 files in a staging directory. </li> <br />
 
- <li> <tt>-U</tt>&nbsp;<em>utmp_user</em>&nbsp;: this option is only
-available when the s6-linux-init package has been built with the
-<tt>--enable-utmps</tt> configure option, that enables support for the
-<a href="//skarnet.org/software/utmps/">utmps</a> package. The option
-defines the user that the <tt>utmpd</tt> service
-will run as, and activates this service. (Note that you will still
-have to create a <tt>wtmpd</tt> service yourself and activate it
-later in the boot sequence, after a writable filesystem is mounted,
-because the wtmp database is supposed to be persistent and should live
-on a real filesystem.
-s6-linux-init cannot do that for you, because it only handles the
-early part of the boot sequence, before filesystems are mounted.)
-Default is <strong>no utmpd service</strong>. </li> <br />
-
  <li> <tt>-C</tt>&nbsp;: create a set of scripts that is suitable
 for running <em>in a container</em>. This modifies some behaviours:
   <ul>
@@ -467,23 +452,6 @@ given. </li>
   </ul> </li>
 </ul>
 
-<p>
- If s6-linux-init has been built with
-<a href="//skarnet.org/software/utmps/">utmps</a> support, some more
-directories may exist:
-</p>
-
-<ul>
- <li> A directory somewhere under <tt>run-image</tt>, by default <tt>utmps</tt>,
-that is the location where the utmp files will be created. </li>
- <li> An additional early service named <tt>utmpd</tt>, which is
-a part of the <a href="//skarnet.org/software/utmps/">utmps</a> way of
-providing secure utmp functionality. A similar <tt>wtmpd</tt> service
-should also be created and run later in the boot sequence by the
-service manager; it is not s6-linux-init's job to do it because
-<tt>wtmp</tt> requires a real, writable filesystem. </li>
-</ul>
-
 <h2> Notes </h2>
 
 <p>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 3cb3b56..8dc841e 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,20 @@
 
 <h1> What has changed in s6-linux-init </h1>
 
+<h2> in 1.1.0.0 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.13.1.0. </li>
+ <li> <a href="//skarnet.org/software/execline/">execline</a>
+dependency bumped to 2.9.2.0. </li>
+ <li> <a href="//skarnet.org/software/s6/">s6</a>
+dependency bumped to 2.11.3.0. </li>
+ <li> <a href="s6-linux-init-maker.html">s6-linux-init-maker</a>
+does not create early utmpd scripts anymore. Users are expected
+to handle utmpd at the same time as wtmpd, i.e. first thing in stage 2. </li>
+</ul>
+
 <h2> in 1.0.8.1 </h2>
 
 <ul>