More fixes, with a new version of s6-l-i

Signed-off-by: Laurent Bercot <[email protected]>

conf/versions

@@ -18,8 +18,8 @@ S6_VERSION=v2.11.0.1
 # S6_RC_VERSION=58f93f6c710cc88acfa721a45efc1f64dfc557df
 S6_RC_VERSION=v0.5.3.0
 
-# S6_LINUX_INIT_VERSION=e2eb6c0257826ed59b98f5fec5a071624dbe5dfb
-S6_LINUX_INIT_VERSION=v1.0.7.0
+S6_LINUX_INIT_VERSION=3151e4828a08586cdee65766c94a70488bdb0a86
+# S6_LINUX_INIT_VERSION=v1.0.7.0
 
 # S6_PORTABLE_UTILS_VERSION=ef4838c7d0007b3c43da5d10649bcf1b0b3557a7
 S6_PORTABLE_UTILS_VERSION=v2.2.3.4

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/command/logutil-newfifo

@@ -7,7 +7,7 @@ multisubstitute
   importas -u -D "root" owner ELGETOPT_o
   elgetpositionals -P0
 }
-emptyenv -P
+emptyenv -oP
 if { s6-test ${#} -ge 1 }
 
 if

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/command/logutil-service

@@ -6,7 +6,7 @@ multisubstitute
   importas -u -D "" fifo ELGETOPT_f
   elgetpositionals -P0
 }
-emptyenv -P
+emptyenv -oP
 if { s6-test ${#} -ge 1 }
 ifelse { s6-test -n ${fifo} }
 {

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/command/with-retries

@@ -11,7 +11,7 @@ multisubstitute
   importas -u -D 500 timeout ELGETOPT_t
   elgetpositionals -P0
 }
-emptyenv -P
+emptyenv -oP
 forbacktickx -x 0,1 -d"\n" i { s6-seq 0 ${nretries} }
   importas -u i i
   if { s6-test ${i} -ne ${nretries} }

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/libexec/fix-attrs

@@ -31,7 +31,7 @@ while read globex recurse userentry fmode dmode ; do
     if test "${account%%:*}" != "$account" ; then
       opts='-nB'
     else
-      opts=""
+      opts=''
     fi
     uidgid=`s6-envuidgid "$default" $opts -- "$account" multisubstitute importas UID UID importas GID GID '' s6-echo -- '${UID}:${GID}'`
     uid=${uidgid%%:*}

layout/rootfs-overlay/package/admin/s6-overlay-@VERSION@/libexec/preinit

@@ -10,7 +10,6 @@ prog=/package/admin/s6-overlay/libexec/preinit
 
 
 # Ensure /run is writable
-
 if test "0$S6_READ_ONLY_ROOT" -ne 0 ; then
   echo "$prog: info: read-only root" 1>&2
   if ! test -d /run ; then
@@ -28,19 +27,18 @@ if test "0$S6_READ_ONLY_ROOT" -ne 0 ; then
 else
   s6-mkdir -p -m 0755 /run
 fi
-
+if test "0$UID" -ne 0 ; then
+  s6-chown -U -- /run
+fi
 
 # Ensure /var/run is a symlink to /run
-
 if test -L /var/run && test "`s6-linkname -f /var/run`" = /run ; then : ; else
   echo "$prog: notice: /var/run is not a symlink to /run, fixing it" 1>&2
   s6-rmrf /var/run
   s6-ln -s /run /var/run
 fi
 
-
-# /run/s6 is recreated every time and belongs to the USER.
-
+# /run/s6 is recreated every time.
 s6-rmrf /run/s6
 s6-mkdir -m 0755 /run/s6
 if test "0$UID" -ne 0 ; then