summaryrefslogtreecommitdiff
path: root/examples/ROOT/img/services-local
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-03-01 07:28:43 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-03-01 07:28:43 +0000
commit0e23f8f864a795214506918de4f7f5897f5e0730 (patch)
treec29c378e6b465488a63d25407fc4b80ce97b9174 /examples/ROOT/img/services-local
parent1473905fd7b31abafb54929fbd3c84e53cdc7841 (diff)
downloads6-0e23f8f864a795214506918de4f7f5897f5e0730.tar.xz
Cleanup changes in examples/ (thanks Colin Booth)
Diffstat (limited to 'examples/ROOT/img/services-local')
-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
2 files changed, 6 insertions, 6 deletions
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