From 0e23f8f864a795214506918de4f7f5897f5e0730 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 1 Mar 2015 07:28:43 +0000 Subject: Cleanup changes in examples/ (thanks Colin Booth) --- examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE | 7 ------- examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT | 6 ++++++ examples/ROOT/img/services-local/syslogd-linux/log/run | 9 +++++---- examples/ROOT/img/tmpfs/README | 4 +++- examples/ROOT/img/tmpfs/service/s6-svscan-log/run | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE create mode 100644 examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT (limited to 'examples/ROOT/img') diff --git a/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE b/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE deleted file mode 100644 index 814f95c..0000000 --- a/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGLINE +++ /dev/null @@ -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 new file mode 100644 index 0000000..65c53e6 --- /dev/null +++ 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 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, -- cgit v1.2.3