s6

commit 0e23f8f864a795214506918de4f7f5897f5e0730
parent 1473905fd7b31abafb54929fbd3c84e53cdc7841
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Sun,  1 Mar 2015 07:28:43 +0000

 Cleanup changes in examples/ (thanks Colin Booth)

Diffstat:
M
.gitignore
 | 
1
-
M
AUTHORS
 | 
2
+-
D
examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE
 | 
7
-------
A
examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT
 | 
6
++++++
M
examples/ROOT/img/services-local/syslogd-linux/log/run
 | 
9
+++++----
M
examples/ROOT/img/tmpfs/README
 | 
4
+++-
M
examples/ROOT/img/tmpfs/service/s6-svscan-log/run
 | 
2
+-

7 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,3 @@
 *.lo
 *.so
 *.so.*
-*~
diff --git a/AUTHORS b/AUTHORS
@@ -8,6 +8,7 @@ Contributors:
   Stefan Karrman <sk@mathematik.uni-ulm.de>
   Jean Marot <jean.marot@skarnet.org>
   Olivier Brunel <jjk@jjacky.com>
+  Colin Booth <cathexis@gmail.com>
 
 Thanks to:
   Dan J. Bernstein <djb@cr.yp.to>
@@ -17,6 +18,5 @@ Thanks to:
   Frans Haarman <franshaarman@gmail.com>
   Vallo Kallaste <kalts@estpak.ee>
   Patrick Mahoney <pat@polycrystal.org>
-  Colin Booth <cathexis@gmail.com>
   Roy Lanek <roy.lanek@gmail.com>
   Gorka Lertxundi <glertxundi@gmail.com>
diff --git a/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE b/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE
@@ -1,7 +0,0 @@
-- +^error\. t /var/log/syslogd/error 
-- +^authpriv\. t /var/log/syslogd/auth 
-- +^user\. t /var/log/syslogd/user 
-- +^messages\. t /var/log/syslogd/messages 
-- +^daemon\. t /var/log/syslogd/daemon 
-- f t /var/log/syslogd/misc
-
diff --git a/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT b/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT
@@ -0,0 +1,6 @@
+- +^error\. t /var/log/syslogd/error 
+- +^authpriv\. t /var/log/syslogd/auth 
+- +^user\. t /var/log/syslogd/user 
+- +^messages\. t /var/log/syslogd/messages 
+- +^daemon\. t /var/log/syslogd/daemon 
+f t /var/log/syslogd/misc
diff --git a/examples/ROOT/img/services-local/syslogd-linux/log/run b/examples/ROOT/img/services-local/syslogd-linux/log/run
@@ -1,7 +1,8 @@
 #!/command/execlineb -P
-s6-envdir -f env
-import -Cs LOGLINE
 s6-setuidgid syslog
+s6-envdir -f env
+import -Cs LOGSCRIPT
 exec -c
-s6-log $LOGLINE
-# Change env/LOGLINE to alter s6-log's behaviour
+s6-log $LOGSCRIPT
+
+# Change env/LOGSCRIPT to alter s6-log's behaviour
diff --git a/examples/ROOT/img/tmpfs/README b/examples/ROOT/img/tmpfs/README
@@ -4,4 +4,6 @@ during stage 1 init, so the basics are covered for stage 2:
  - /tmp points to a real, writable temporary directory
  - /service points to a real, writable scan directory that
 already contains basic services (s6-svscan's own logger and
-an early getty).
+an early getty)
+ - /mnt/tmpfs/uncaught-logs is the place in RAM where the
+catch-all logger stores and rotates its logs.
diff --git a/examples/ROOT/img/tmpfs/service/s6-svscan-log/run b/examples/ROOT/img/tmpfs/service/s6-svscan-log/run
@@ -3,7 +3,7 @@ redirfd -w 2 /dev/console
 redirfd -rnb 0 fifo
 s6-setuidgid nobody
 exec -c
-s6-log -bp t /tmp/uncaught-logs
+s6-log -bp t /mnt/tmpfs/uncaught-logs
 
 #  The -p option is important:
 # even if s6-svscan is told to kill everything,