update to latest skaware.

use notification-fd instead of s6-notifywhenup, s6-supervise includes it in its core. Preserve with-notifywhenup utility until s6-notifywhenup is effectively removed from s6 package.
just-containers · Jun 18, 2015 · 8829138 · 8829138
1 parent 53f2fe8
commit 8829138
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/builder/build-latest b/builder/build-latest
@@ -6,7 +6,7 @@ set -x
 ## PARAMS
 ##
 
-RELEASE_VERSION=${RELEASE_VERSION:-1.11.0.0}
+RELEASE_VERSION=${RELEASE_VERSION:-1.12.0.0}
 SKAWARE_VERSION=${RELEASE_VERSION%.*}
 
 PWD=$(pwd)

diff --git a/builder/overlay-rootfs/etc/s6/services/s6-fdholderd/notification-fd b/builder/overlay-rootfs/etc/s6/services/s6-fdholderd/notification-fd
@@ -0,0 +1 @@
+1
diff --git a/builder/overlay-rootfs/etc/s6/services/s6-fdholderd/run b/builder/overlay-rootfs/etc/s6/services/s6-fdholderd/run
@@ -1,4 +1,3 @@
 #!/usr/bin/execlineb -P
-s6-notifywhenup
 s6-envuidgid -D 32769:32769 daemon
 s6-fdholder-daemon -U -1 -i rules -- /var/run/s6/fdholderd-socket
diff --git a/builder/overlay-rootfs/usr/bin/with-notifywhenup b/builder/overlay-rootfs/usr/bin/with-notifywhenup
@@ -1,4 +1,5 @@
 #!/usr/bin/execlineb -S0
+# DO NOT USE THIS, it's deprecated. Use a "notification-fd" file + s6-echo instead.
 foreground { s6-notifywhenup -f s6-echo }
 unexport ?
 $@