From 4da6b9c320e6b49d38af5cb6b5861480141f24cd Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 6 Oct 2015 16:23:19 +0000 Subject: - add -s support to s6-svscan - change examples to support -s - change examples to invoke s6-rc, remove servicedirs --- examples/ROOT/img/services-local/README | 5 ----- examples/ROOT/img/services-local/klogd-linux/README | 3 --- examples/ROOT/img/services-local/klogd-linux/log/README | 1 - examples/ROOT/img/services-local/klogd-linux/log/run | 4 ---- examples/ROOT/img/services-local/klogd-linux/run | 5 ----- examples/ROOT/img/services-local/syslogd-linux/README | 7 ------- examples/ROOT/img/services-local/syslogd-linux/log/README | 9 --------- examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT | 6 ------ examples/ROOT/img/services-local/syslogd-linux/log/run | 8 -------- examples/ROOT/img/services-local/syslogd-linux/notification-fd | 1 - examples/ROOT/img/services-local/syslogd-linux/run | 8 -------- 11 files changed, 57 deletions(-) delete mode 100644 examples/ROOT/img/services-local/README delete mode 100644 examples/ROOT/img/services-local/klogd-linux/README delete mode 100644 examples/ROOT/img/services-local/klogd-linux/log/README delete mode 100755 examples/ROOT/img/services-local/klogd-linux/log/run delete mode 100755 examples/ROOT/img/services-local/klogd-linux/run delete mode 100644 examples/ROOT/img/services-local/syslogd-linux/README delete mode 100644 examples/ROOT/img/services-local/syslogd-linux/log/README delete mode 100644 examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT delete mode 100755 examples/ROOT/img/services-local/syslogd-linux/log/run delete mode 100644 examples/ROOT/img/services-local/syslogd-linux/notification-fd delete mode 100755 examples/ROOT/img/services-local/syslogd-linux/run (limited to 'examples/ROOT/img/services-local') diff --git a/examples/ROOT/img/services-local/README b/examples/ROOT/img/services-local/README deleted file mode 100644 index 9e4c027..0000000 --- a/examples/ROOT/img/services-local/README +++ /dev/null @@ -1,5 +0,0 @@ -This is the service repository for services that should be started -early, typically before the network goes up. -"klogd" and "syslogd" services should be present as soon as possible, -because other services might need them. However, since they need -a writable disk filesystem, they can't be run as early as a getty. diff --git a/examples/ROOT/img/services-local/klogd-linux/README b/examples/ROOT/img/services-local/klogd-linux/README deleted file mode 100644 index ec95a00..0000000 --- a/examples/ROOT/img/services-local/klogd-linux/README +++ /dev/null @@ -1,3 +0,0 @@ -This klogd emulation is only valid under Linux. -The service only processes logs from /proc/kmsg and -sends them to stdout, i.e. its own logger. diff --git a/examples/ROOT/img/services-local/klogd-linux/log/README b/examples/ROOT/img/services-local/klogd-linux/log/README deleted file mode 100644 index 6b51a4a..0000000 --- a/examples/ROOT/img/services-local/klogd-linux/log/README +++ /dev/null @@ -1 +0,0 @@ -Processed kernel logs will be logged to the /var/log/klogd/ logdir. diff --git a/examples/ROOT/img/services-local/klogd-linux/log/run b/examples/ROOT/img/services-local/klogd-linux/log/run deleted file mode 100755 index d9659e7..0000000 --- a/examples/ROOT/img/services-local/klogd-linux/log/run +++ /dev/null @@ -1,4 +0,0 @@ -#!/command/execlineb -P -s6-setuidgid klog -exec -c -s6-log t s1000000 n20 /var/log/klogd diff --git a/examples/ROOT/img/services-local/klogd-linux/run b/examples/ROOT/img/services-local/klogd-linux/run deleted file mode 100755 index 453b55b..0000000 --- a/examples/ROOT/img/services-local/klogd-linux/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/command/execlineb -P -fdmove -c 2 1 -redirfd -r 0 /proc/kmsg -exec -c -ucspilogd diff --git a/examples/ROOT/img/services-local/syslogd-linux/README b/examples/ROOT/img/services-local/syslogd-linux/README deleted file mode 100644 index a3c3ba4..0000000 --- a/examples/ROOT/img/services-local/syslogd-linux/README +++ /dev/null @@ -1,7 +0,0 @@ -This syslogd emulation works on any Unix where syslog() is -implemented via a connection on the /dev/log Unix-domain socket. -It needs a Unix superserver (see s6-networking, ucspi-unix or -ucspi-ipc) and ucspilogd. -A ucspilogd process is spawned for every syslog() client. It -processes logs and sends them to stderr, i.e. the service's -logger. diff --git a/examples/ROOT/img/services-local/syslogd-linux/log/README b/examples/ROOT/img/services-local/syslogd-linux/log/README deleted file mode 100644 index 9d4968e..0000000 --- a/examples/ROOT/img/services-local/syslogd-linux/log/README +++ /dev/null @@ -1,9 +0,0 @@ - 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 deleted file mode 100644 index e7a1eb7..0000000 --- a/examples/ROOT/img/services-local/syslogd-linux/log/env/LOGSCRIPT +++ /dev/null @@ -1,6 +0,0 @@ -- +^[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/img/services-local/syslogd-linux/log/run b/examples/ROOT/img/services-local/syslogd-linux/log/run deleted file mode 100755 index 56de271..0000000 --- a/examples/ROOT/img/services-local/syslogd-linux/log/run +++ /dev/null @@ -1,8 +0,0 @@ -#!/command/execlineb -P -s6-setuidgid syslog -s6-envdir -f env -import -Cs LOGSCRIPT -exec -c -s6-log $LOGSCRIPT - -# Change env/LOGSCRIPT to alter s6-log's behaviour diff --git a/examples/ROOT/img/services-local/syslogd-linux/notification-fd b/examples/ROOT/img/services-local/syslogd-linux/notification-fd deleted file mode 100644 index 00750ed..0000000 --- a/examples/ROOT/img/services-local/syslogd-linux/notification-fd +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/examples/ROOT/img/services-local/syslogd-linux/run b/examples/ROOT/img/services-local/syslogd-linux/run deleted file mode 100755 index de33c2c..0000000 --- a/examples/ROOT/img/services-local/syslogd-linux/run +++ /dev/null @@ -1,8 +0,0 @@ -#!/command/execlineb -P -fdmove -c 2 1 -exec -c -s6-envuidgid nobody -fdmove 1 3 -s6-ipcserver -U -1 -- /dev/log -fdmove -c 1 2 -ucspilogd IPCREMOTEEUID IPCREMOTEEGID -- cgit v1.2.3