Merge pull request #111 from glerchundi/master

fixes #72 and #108

builder/build-latest

@@ -6,7 +6,7 @@ set -x
 ## PARAMS
 ##
 
-RELEASE_VERSION=${RELEASE_VERSION:-1.16.1.0}
+RELEASE_VERSION=${RELEASE_VERSION:-1.17.0.0}
 SKAWARE_VERSION=${RELEASE_VERSION%.*}
 SKAWARE_SOURCE=${SKAWARE_SOURCE:-https://github.com/just-containers/skaware/releases/download/v$SKAWARE_VERSION}
 

builder/overlay-rootfs/etc/s6/init-catchall/init-stage1

@@ -1,4 +1,4 @@
-#!/usr/bin/execlineb -S0
+#!/bin/execlineb -S0
 
 ##
 ## ensure our vital fifo exists

builder/overlay-rootfs/etc/s6/init-catchall/init-stage2

@@ -1,2 +1,2 @@
-#!/usr/bin/execlineb -S0
+#!/bin/execlineb -S0
 /etc/s6/init/init-stage2 $@

builder/overlay-rootfs/etc/s6/init-no-catchall/init-stage1

@@ -1,4 +1,4 @@
-#!/usr/bin/execlineb -S0
+#!/bin/execlineb -S0
 
 ##
 ## init the scandir with our base services

builder/overlay-rootfs/etc/s6/init-no-catchall/init-stage2

@@ -1,2 +1,2 @@
-#!/usr/bin/execlineb -S0
+#!/bin/execlineb -S0
 /etc/s6/init/init-stage2 $@

builder/overlay-rootfs/etc/s6/init/init-stage1

@@ -1,11 +1,11 @@
-#!/usr/bin/execlineb -S0
+#!/bin/execlineb -S0
 
 ##
 ## dump environment into an envdir
 ##
 
-/usr/bin/if { /usr/bin/s6-mkdir -pm 0755 -- /var/run/s6/container_environment }
-/usr/bin/if { /usr/bin/s6-dumpenv -- /var/run/s6/container_environment }
+/bin/if { /bin/s6-mkdir -pm 0755 -- /var/run/s6/container_environment }
+/bin/if { /bin/s6-dumpenv -- /var/run/s6/container_environment }
 
 
 ##
@@ -14,16 +14,16 @@
 ## consistency.
 ##
 
-/usr/bin/if
+/bin/if
 {
-  /usr/bin/elglob -0 -- envdirs /var/run/s6/env-*
-  /usr/bin/forx -p -- envdir { ${envdirs} }
-  /usr/bin/importas -u envdir envdir
-  /usr/bin/s6-rmrf ${envdir}
+  /bin/elglob -0 -- envdirs /var/run/s6/env-*
+  /bin/forx -p -- envdir { ${envdirs} }
+  /bin/importas -u envdir envdir
+  /bin/s6-rmrf ${envdir}
 }
-/usr/bin/if { /usr/bin/s6-hiercopy /etc/s6/init/env /var/run/s6/env-stage1 }
-/usr/bin/if { /usr/bin/s6-mkdir -pm 0755 -- /var/run/s6/env-stage2 }
-/usr/bin/if { /usr/bin/s6-mkdir -pm 0755 -- /var/run/s6/env-stage3 }
+/bin/if { /bin/s6-hiercopy /etc/s6/init/env /var/run/s6/env-stage1 }
+/bin/if { /bin/s6-mkdir -pm 0755 -- /var/run/s6/env-stage2 }
+/bin/if { /bin/s6-mkdir -pm 0755 -- /var/run/s6/env-stage3 }
 
 
 ##
@@ -32,9 +32,9 @@
 ## environment by using "with-contenv program".
 ##
 
-/usr/bin/exec -c --
-/usr/bin/s6-envdir /var/run/s6/env-stage1
-/usr/bin/exec --
+/bin/exec -c --
+/bin/s6-envdir /var/run/s6/env-stage1
+/bin/exec --
 
 
 ##

builder/overlay-rootfs/etc/s6/init/init-stage2

@@ -1,4 +1,4 @@
-#!/usr/bin/execlineb -S0
+#!/bin/execlineb -S0
 
 # This file is executed (not as process 1!) as soon as s6-svscan
 # starts, with the original stdin/out/err, but NOT the original

builder/overlay-rootfs/etc/s6/init/init-stage2-redirfd

@@ -1,4 +1,4 @@
-#!/usr/bin/execlineb -S0
+#!/bin/execlineb -S0
 
 backtick -D 0 -n S6_LOGGING { printcontenv S6_LOGGING }
 importas -u S6_LOGGING S6_LOGGING

builder/overlay-rootfs/etc/s6/init/init-stage3

@@ -1,4 +1,4 @@
-#!/usr/bin/execlineb -S0
+#!/bin/execlineb -S0
 
 # This is the shutdown script, running as process 1.
 cd /

builder/overlay-rootfs/etc/s6/services/.s6-svscan/crash

@@ -1,4 +1,4 @@
-#!/usr/bin/execlineb -P
+#!/bin/execlineb -P
 
 # This file is run when an unrecoverable error happens
 # to s6-svscan. Edit it to suit your needs.

builder/overlay-rootfs/etc/s6/services/.s6-svscan/finish

@@ -1,2 +1,2 @@
-#!/usr/bin/execlineb -S0
+#!/bin/execlineb -S0
 /etc/s6/init/init-stage3 $@

builder/overlay-rootfs/etc/s6/services/s6-fdholderd/run

@@ -1,3 +1,3 @@
-#!/usr/bin/execlineb -P
+#!/bin/execlineb -P
 s6-envuidgid -D 32769:32769 daemon
 s6-fdholder-daemon -U -1 -i rules -- /var/run/s6/fdholderd-socket

builder/overlay-rootfs/etc/s6/services/s6-svscan-log/run

@@ -1,2 +1,2 @@
-#!/usr/bin/execlineb -P
+#!/bin/execlineb -P
 logutil-service -f /var/run/s6/uncaught-logs-fifo /var/log/s6-uncaught-logs

builder/overlay-rootfs/init

@@ -1,2 +1,2 @@
-#!/usr/bin/execlineb -S0
+#!/bin/execlineb -S0
 /etc/s6/init/init-stage1 $@

builder/overlay-rootfs/usr/bin/execlineb

@@ -0,0 +1 @@
+/bin/execlineb

builder/overlay-rootfs/usr/bin/fix-attrs

@@ -1,7 +1,7 @@
-#!/usr/bin/execlineb -P
+#!/bin/execlineb -P
 
-/usr/bin/export PATH /usr/bin:/bin
-/usr/bin/export recfunction "\
+/bin/export PATH /usr/bin:/bin
+/bin/export recfunction "\
 multidefine -Cd"," -- ${3} { account uidgid }
 backtick -n envuidgid_opts
 {

builder/overlay-rootfs/usr/bin/logutil-newfifo

@@ -1,4 +1,4 @@
-#!/usr/bin/execlineb
+#!/bin/execlineb
 
 elgetopt "m:o:"
 multisubstitute

builder/overlay-rootfs/usr/bin/logutil-service

@@ -1,4 +1,4 @@
-#!/usr/bin/execlineb
+#!/bin/execlineb
 
 # test if arguments were given
 elgetopt "f:"

builder/overlay-rootfs/usr/bin/logutil-service-main

@@ -1,4 +1,4 @@
-#!/usr/bin/execlineb -S1
+#!/bin/execlineb -S1
 
 # this env decides what to log and how.
 backtick -D "n20 s1000000 T" -n S6_LOGGING_SCRIPT { printcontenv S6_LOGGING_SCRIPT }

builder/overlay-rootfs/usr/bin/printcontenv

@@ -1,4 +1,4 @@
-#!/usr/bin/execlineb -S0
+#!/bin/execlineb -S0
 
 # test if arguments were given
 if { s6-test ${#} -ge 1 }

builder/overlay-rootfs/usr/bin/with-contenv

@@ -1,5 +1,5 @@
-#!/usr/bin/execlineb -S0
-/usr/bin/exec -c --
-/usr/bin/s6-envdir -fn -- /var/run/s6/container_environment
-/usr/bin/exec --
+#!/bin/execlineb -S0
+/bin/exec -c --
+/bin/s6-envdir -fn -- /var/run/s6/container_environment
+/bin/exec --
 $@

builder/overlay-rootfs/usr/bin/with-retries

@@ -1,4 +1,4 @@
-#!/usr/bin/execlineb
+#!/bin/execlineb
 
 #
 # with-retries -n numretries -t millisecs prog...