From 392a1b8d4cfdb40812fa9434f06fd3ff73e39973 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Thu, 1 Jun 2023 03:56:37 +0000
Subject:  Prepare for 1.1.1.2; accept hiercopy when /run can't be chmodded

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 INSTALL                  | 2 +-
 NEWS                     | 6 ++++++
 doc/index.html           | 4 ++--
 doc/upgrade.html         | 7 +++++++
 package/info             | 2 +-
 src/init/s6-linux-init.c | 2 +-
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/INSTALL b/INSTALL
index b8536d9..df09122 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A Linux-based system with a standard C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.13.1.1 or later: https://skarnet.org/software/skalibs/
+  - skalibs version 2.13.2.0 or later: https://skarnet.org/software/skalibs/
   - Optional: nsss version 0.2.0.3 or later: https://skarnet.org/software/nsss/
   - Optional: utmps version 0.1.2.1 or later: https://skarnet.org/software/utmps/
   - execline version 2.9.3.0 or later: https://skarnet.org/software/execline/
diff --git a/NEWS b/NEWS
index 04d0428..b4ad36e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-linux-init.
 
+In 1.1.1.2
+----------
+
+ - Bugfixes.
+
+
 In 1.1.1.1
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 54a4d5c..a4d515d 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -73,7 +73,7 @@ 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.1.1 or later. It's a build-time requirement. It's also a run-time
+2.13.2.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
@@ -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.1.1.1.tar.gz">1.1.1.1</a>. </li>
+<a href="s6-linux-init-1.1.1.2.tar.gz">1.1.1.2</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/upgrade.html b/doc/upgrade.html
index 212842e..8133a41 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in s6-linux-init </h1>
 
+<h2> in 1.1.1.2 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.13.2.0. </li>
+</ul>
+
 <h2> in 1.1.1.1 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 4d78ea1..98ea727 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-init
-version=1.1.1.1
+version=1.1.1.2
 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 103c233..3c160bf 100644
--- a/src/init/s6-linux-init.c
+++ b/src/init/s6-linux-init.c
@@ -266,7 +266,7 @@ int main (int argc, char const **argv, char const *const *envp)
     memcpy(fn, basedir, dirlen) ;
     fn[dirlen] = '/' ;
     memcpy(fn + dirlen + 1, RUNIMAGE, sizeof(RUNIMAGE)) ;
-    if (!hiercopy(fn, S6_LINUX_INIT_TMPFS))
+    if (!hiercopy_loose(fn, S6_LINUX_INIT_TMPFS))
       strerr_diefu3sys(111, "copy ", fn, " to " S6_LINUX_INIT_TMPFS) ;
     memcpy(fn + dirlen + 1, ENVSTAGE1, sizeof(ENVSTAGE1)) ;
     if (envdir_internal(fn, &envmodifs, SKALIBS_ENVDIR_VERBATIM | SKALIBS_ENVDIR_NOCLAMP, '\n') == -1)
-- 
cgit v1.2.3