Prepare for 1.2.0.0. env_store now needs to be read with chomp.

7 files changed, 45 insertions, 15 deletions

diff --git a/INSTALL b/INSTALL
index 5dcba6d..c92a3d3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,11 +6,11 @@ Build Instructions
 
   - A Linux-based system with a standard C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.14.4.0 or later: https://skarnet.org/software/skalibs/
-  - Optional: nsss version 0.2.1.0 or later: https://skarnet.org/software/nsss/
-  - Optional: utmps version 0.1.3.0 or later: https://skarnet.org/software/utmps/
-  - execline version 2.9.7.0 or later: https://skarnet.org/software/execline/
-  - s6 version 2.13.2.0 or later: https://skarnet.org/software/s6/
+  - skalibs version 2.14.5.0 or later: https://skarnet.org/software/skalibs/
+  - Optional: nsss version 0.2.1.1 or later: https://skarnet.org/software/nsss/
+  - Optional: utmps version 0.1.3.2 or later: https://skarnet.org/software/utmps/
+  - execline version 2.9.7.1 or later: https://skarnet.org/software/execline/
+  - s6 version 2.13.3.0 or later: https://skarnet.org/software/s6/
 
  This software is Linux-specific. It will run on a Linux kernel,
 version 2.6.32 or later. However, it should not be too hard to port to
diff --git a/NEWS b/NEWS
index a1d4b37..95e49c8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-linux-init.
 
+In 1.2.0.0
+----------
+
+ - s6-linux-init -s now dumps env without nochomp.
+
+
 In 1.1.3.0
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 51081c5..ff653e5 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.14.4.0 or later. It's a build-time requirement. It's also a run-time
+2.14.5.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.7.0 or later. It is a build-time and boot-time requirement. </li>
+2.9.7.1 or later. It is a build-time and boot-time requirement. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.13.2.0 or later. It is a build-time and boot-time requirement. </li>
+2.13.3.0 or later. It is a build-time and boot-time requirement. </li>
 </ul>
 
 <p>
@@ -93,10 +93,10 @@ against the shared version of the skalibs library. </li>
  <li> If you're using <a href="https://www.musl-libc.org/">musl</a> and
 want nsswitch-like functionality:
 <a href="//skarnet.org/software/nsss/">nsss</a> version
-0.2.1.0 or later (build-time and boot-time) </li>
+0.2.1.1 or later (build-time and boot-time) </li>
  <li> If you want secure utmp functionality:
 <a href="//skarnet.org/software/utmps/">utmps</a> version
-0.1.3.0 or later (build-time and boot-time) </li>
+0.1.3.2 or later (build-time and boot-time) </li>
 </ul>
 
 <h3> Licensing </h3>
@@ -110,8 +110,8 @@ want nsswitch-like functionality:
 
 <ul>
  <li> The current released version of s6-linux-init is
-<a href="s6-linux-init-1.1.3.0.tar.gz">1.1.3.0</a>.
-You can access its checksum <a href="s6-linux-init-1.1.3.0.tar.gz.sha256">here</a>. </li>
+<a href="s6-linux-init-1.2.0.0.tar.gz">1.2.0.0</a>.
+You can access its checksum <a href="s6-linux-init-1.2.0.0.tar.gz.sha256">here</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 afbe8cd..fb2880d 100644
--- a/doc/s6-linux-init-maker.html
+++ b/doc/s6-linux-init-maker.html
@@ -249,7 +249,7 @@ needed at a later time; in that case, giving the <tt>-s</tt> option
 to <tt>s6-linux-init-maker</tt> makes stage 1 init dump the "kernel" environment
 variables into the <em>env_store</em> directory (under a format that is
 later readable with
-<a href="//skarnet.org/software/s6/s6-envdir.html">s6-envdir -fn</a>)
+<a href="//skarnet.org/software/s6/s6-envdir.html">s6-envdir -f</a>)
 before erasing them. <em>env_store</em> should obviously be
 a writable directory, so it should be located under <tt>/run</tt>
 (or your chosen tmpfsdir)!
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 265367b..6562cd6 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,30 @@
 
 <h1> What has changed in s6-linux-init </h1>
 
+<h2> in 1.2.0.0 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.14.5.0. </li>
+ <li> <a href="//skarnet.org/software/nsss/">nsss</a>
+optional dependency bumped to 0.2.1.1. </li>
+ <li> <a href="//skarnet.org/software/utmps/">utmps</a>
+optional dependency bumped to 0.1.3.2. </li>
+ <li> <a href="//skarnet.org/software/execline/">execline</a>
+dependency bumped to 2.9.7.1. </li>
+ <li> <a href="//skarnet.org/software/s6/">s6</a>
+dependency bumped to 2.13.3.0. </li>
+ <li> The format of the envdir created by the <tt>-s</tt> option to
+<a href="s6-linux-init.html">s6-linux-init</a> (and indirectly
+<a href="s6-linux-init-maker.html">s6-linux-init-maker</a>) has
+changed: it is now meant to be read by
+<a href="//skarnet.org/software/s6/s6-envdir.html">s6-envdir -f</a>,
+without the <tt>-n</tt> option. The change should normally not
+impact you, but if you're using the <tt>-s</tt> functionality, be
+aware of it the next time you run
+<a href="s6-linux-init-maker.html">s6-linux-init-maker</a>. </li>
+</ul>
+
 <h2> in 1.1.3.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 5ed3a49..436fc35 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-init
-version=1.1.3.0
+version=1.2.0.0
 category=admin
 package_macro_name=S6_LINUX_INIT
diff --git a/src/init/s6-linux-init.c b/src/init/s6-linux-init.c
index ef93afa..95eefd7 100644
--- a/src/init/s6-linux-init.c
+++ b/src/init/s6-linux-init.c
@@ -280,7 +280,7 @@ int main (int argc, char const **argv, char const *const *envp)
     if (envdir_internal(fn, &envmodifs, SKALIBS_ENVDIR_VERBATIM | SKALIBS_ENVDIR_NOCLAMP, '\n') == -1)
       if (verbosity) strerr_warnwu2sys("envdir ", fn) ;
   }
-  if (envdumpdir && !env_dump(envdumpdir, 0700, envp))
+  if (envdumpdir && !env_dump4(envdumpdir, 0700, envp, 0))
     if (verbosity) strerr_warnwu2sys("dump kernel environment to ", envdumpdir) ;
 
   if (!nologger)