- add -s support to s6-svscan

 - change examples to support -s
 - change examples to invoke s6-rc, remove servicedirs

4 files changed, 15 insertions, 0 deletions

diff --git a/examples/klogd-linux/README b/examples/klogd-linux/README
new file mode 100644
index 0000000..712cfa3
--- /dev/null
+++ b/examples/klogd-linux/README
@@ -0,0 +1,5 @@
+This is an example of a service directory for process supervision by s6.
+
+This klogd emulation is only valid under Linux.
+The service only processes logs from /proc/kmsg and
+sends them to stdout, i.e. its own logger.
diff --git a/examples/klogd-linux/log/README b/examples/klogd-linux/log/README
new file mode 100644
index 0000000..6b51a4a
--- /dev/null
+++ b/examples/klogd-linux/log/README
@@ -0,0 +1 @@
+Processed kernel logs will be logged to the /var/log/klogd/ logdir.
diff --git a/examples/klogd-linux/log/run b/examples/klogd-linux/log/run
new file mode 100755
index 0000000..d9659e7
--- /dev/null
+++ b/examples/klogd-linux/log/run
@@ -0,0 +1,4 @@
+#!/command/execlineb -P
+s6-setuidgid klog
+exec -c
+s6-log t s1000000 n20 /var/log/klogd
diff --git a/examples/klogd-linux/run b/examples/klogd-linux/run
new file mode 100755
index 0000000..453b55b
--- /dev/null
+++ b/examples/klogd-linux/run
@@ -0,0 +1,5 @@
+#!/command/execlineb -P
+fdmove -c 2 1
+redirfd -r 0 /proc/kmsg
+exec -c
+ucspilogd