From af21e602b1dad1b7fd2c00f570d1d5605b9bb277 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 20 May 2019 13:30:47 +0000
Subject:  Improve UX following IRC feedback, prepare for 1.0.1.0

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

(limited to 'doc')

diff --git a/doc/index.html b/doc/index.html
index 4cffd46..cb9cd58 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -110,7 +110,7 @@ all the other packages against the <em>static</em> version of libskarnet.
 
 <ul>
  <li> The current released version of s6-linux-init is
-<a href="s6-linux-init-1.0.0.0.tar.gz">1.0.0.0</a>. </li>
+<a href="s6-linux-init-1.0.1.0.tar.gz">1.0.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 34fa829..218af02 100644
--- a/doc/s6-linux-init-maker.html
+++ b/doc/s6-linux-init-maker.html
@@ -59,7 +59,8 @@ machine</em>. If it is not the case, the system will fail to boot.
        [ -e <em>initial_envvar</em> ] ... \
        [ -q <em>finalsleeptime</em> ] \
        [ -D <em>initdefault</em> ] \
-       [ -n | -N ]
+       [ -n | -N ] \
+       [ -f <em>skeldir</em> ] \
        [ -U <em>utmp_user</em> ] \
        <em>dir</em>
 </pre>
@@ -295,6 +296,14 @@ option if your rootfs is read-only: failure to write to <tt>/run</tt>
 will cause init to die and the kernel to panic. This option is
 incompatible with the <tt>-n</tt> option. </li> <p />
 
+ <li> <tt>-f</tt>&nbsp;<em>skeldir</em>&nbsp;: copy the skeleton
+scripts from directory <em>skeldir</em>. By default, <em>skeldir</em>
+is <tt>/etc/s6-linux-init/skel</tt>, or the directory that has been
+given as an argument to the <tt>--skeldir</tt> configure option at
+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> <p />
+
  <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
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 7c27f49..3804ac6 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,18 @@
 
 <h1> What has changed in s6-linux-init </h1>
 
+<h2> in 1.0.1.0 </h2>
+
+<ul>
+ <li> <tt>-f</tt> option added to
+<a href="s6-linux-init-maker.html">s6-linux-init-maker</a> for use
+in distribution packaging scripts with a staging directory. </li>
+ <li> Permissions on the binaries have been adjusted. </li>
+ <li> The skeleton <tt>runlevel</tt> script now includes a guard to
+avoid calling the service manager without an argument. </li>
+ <li> The permissions of the <tt>/run/uncaught-logs</tt> directory
+in the generated image have been changed to 02750. </li>
+</ul>
 
 <h2> in 1.0.0.0 </h2>
 
-- 
cgit v1.2.3