summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-06-16 06:09:58 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-06-16 06:09:58 +0000
commitdf194e5564f5b32aaf0e107b97095a1dd5bdbe35 (patch)
treea3583e57aa83fccf3fb91a7261f8654c983c9489 /examples
parent0a39023fd7229371dd3e505208a1c0e073414ac2 (diff)
downloads6-df194e5564f5b32aaf0e107b97095a1dd5bdbe35.tar.xz
Update examples/ to use notification-fd
Diffstat (limited to 'examples')
-rw-r--r--examples/ROOT/img/services-local/syslogd-linux/notification-fd1
-rwxr-xr-xexamples/ROOT/img/services-local/syslogd-linux/run2
-rw-r--r--examples/ROOT/img/services-network/sshd/notification-fd1
-rwxr-xr-xexamples/ROOT/img/services-network/sshd/run2
4 files changed, 4 insertions, 2 deletions
diff --git a/examples/ROOT/img/services-local/syslogd-linux/notification-fd b/examples/ROOT/img/services-local/syslogd-linux/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/examples/ROOT/img/services-local/syslogd-linux/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/examples/ROOT/img/services-local/syslogd-linux/run b/examples/ROOT/img/services-local/syslogd-linux/run
index f58a862..de33c2c 100755
--- a/examples/ROOT/img/services-local/syslogd-linux/run
+++ b/examples/ROOT/img/services-local/syslogd-linux/run
@@ -2,7 +2,7 @@
fdmove -c 2 1
exec -c
s6-envuidgid nobody
-s6-notifywhenup -f
+fdmove 1 3
s6-ipcserver -U -1 -- /dev/log
fdmove -c 1 2
ucspilogd IPCREMOTEEUID IPCREMOTEEGID
diff --git a/examples/ROOT/img/services-network/sshd/notification-fd b/examples/ROOT/img/services-network/sshd/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/examples/ROOT/img/services-network/sshd/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/examples/ROOT/img/services-network/sshd/run b/examples/ROOT/img/services-network/sshd/run
index 45bc6a8..3a35a11 100755
--- a/examples/ROOT/img/services-network/sshd/run
+++ b/examples/ROOT/img/services-network/sshd/run
@@ -1,6 +1,6 @@
#!/command/execlineb -P
fdmove -c 2 1
-s6-notifywhenup -f
+fdmove 1 3
s6-tcpserver4 -1 -- 0.0.0.0 22
s6-tcpserver-access -vvDRl0 -t 5000 -i rules
dropbear -iEg