summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--AUTHORS2
-rw-r--r--examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT (renamed from examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE)3
-rwxr-xr-xexamples/ROOT/img/services-local/syslogd-linux/log/run9
-rw-r--r--examples/ROOT/img/tmpfs/README4
-rwxr-xr-xexamples/ROOT/img/tmpfs/service/s6-svscan-log/run2
6 files changed, 11 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index cec61a8..5c6415e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@
*.lo
*.so
*.so.*
-*~
diff --git a/AUTHORS b/AUTHORS
index eb96606..1d6850d 100644
--- 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/LOGSCRIPT
index 814f95c..65c53e6 100644
--- a/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE
+++ b/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT
@@ -3,5 +3,4 @@
- +^user\. t /var/log/syslogd/user
- +^messages\. t /var/log/syslogd/messages
- +^daemon\. t /var/log/syslogd/daemon
-- f t /var/log/syslogd/misc
-
+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
index 3cb4796..56de271 100755
--- 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
index 3b329e4..0a9035d 100644
--- 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
index 7536e1f..47eb828 100755
--- 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,