- fix the LOGSCRIPT in examples/.../syslogd-linux/log

 - fix comments in a few examples/.../README
 - add a /var symlink in examples/ROOT

4 files changed, 17 insertions, 11 deletions

diff --git a/examples/ROOT/etc/s6-init/init-stage2 b/examples/ROOT/etc/s6-init/init-stage2
index ad6d8ce..58ac98d 100755
--- a/examples/ROOT/etc/s6-init/init-stage2
+++ b/examples/ROOT/etc/s6-init/init-stage2
@@ -8,11 +8,11 @@
 if -nt
 {
 
-# This should be logged in /tmp/uncaught-logs/current,
+# This should be logged in /mnt/tmpfs/uncaught-logs/current,
 # NOT on /dev/console !
   if { s6-echo "* init-stage2 starting." }
 
-# Call your one-time EARLY initialization scripts (before bringing
+# Call your one-time early initialization scripts (before bringing
 # the network up) here:
 # set the hostname, mount filesystems, adjust sysctls, etc.
 # if { s6-mount -wt devpts -o noexec,nosuid,gid=0,mode=0600 devpts /dev/pts }
diff --git a/examples/ROOT/img/services-local/syslogd-linux/log/README b/examples/ROOT/img/services-local/syslogd-linux/log/README
index de384ce..9d4968e 100644
--- a/examples/ROOT/img/services-local/syslogd-linux/log/README
+++ b/examples/ROOT/img/services-local/syslogd-linux/log/README
@@ -1,4 +1,9 @@
-This logger service logs everything the syslogd service receives
-into the /var/log/syslogd/ logdir.
-You may want to edit the logging script to provide filters to
-change s6-log's behaviour.
+ This logger service logs everything the syslogd service receives
+into subdirectories of /var/log/syslogd/ logdir.
+
+ The script provided in env/LOGSCRIPT emulates the default
+syslogd behaviour on a majority of Linux distributions.
+
+ Note that spaces cannot be used as is in the LOGSCRIPT file,
+because they are delimiters for the splitting of $LOGSCRIPT
+in the run script. So \s is used instead.
diff --git a/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT b/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT
index 65c53e6..e7a1eb7 100644
--- a/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT
+++ b/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT
@@ -1,6 +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 
+- +^[0-9]+:\s[0-9]+:\serror\. t /var/log/syslogd/error
+- +^[0-9]+:\s[0-9]+:\sauthpriv\. t /var/log/syslogd/auth
+- +^[0-9]+:\s[0-9]+:\suser\. t /var/log/syslogd/user
+- +^[0-9]+:\s[0-9]+:\smessages\. t /var/log/syslogd/messages
+- +^[0-9]+:\s[0-9]+:\sdaemon\. t /var/log/syslogd/daemon
 f t /var/log/syslogd/misc
diff --git a/examples/ROOT/var b/examples/ROOT/var
new file mode 120000
index 0000000..a492c97
--- /dev/null
+++ b/examples/ROOT/var
@@ -0,0 +1 @@
+mnt/rwfs/var
\ No newline at end of file