reorganised

32 files changed, 0 insertions, 208 deletions

diff --git a/s6/base/bin/halt b/s6/base/bin/halt
deleted file mode 100755
index a2c7938..0000000
--- a/s6/base/bin/halt
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/execlineb -S0
-
-s6-linux-init-hpr -h $@
diff --git a/s6/base/bin/init b/s6/base/bin/init
deleted file mode 100755
index 278e493..0000000
--- a/s6/base/bin/init
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/execlineb -S0
-
-s6-linux-init -c "/etc/s6/base" -m 0022 -p "/bin:/sbin:/usr/bin" -D "default" -- "$@"
diff --git a/s6/base/bin/poweroff b/s6/base/bin/poweroff
deleted file mode 100755
index 8177a96..0000000
--- a/s6/base/bin/poweroff
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/execlineb -S0
-
-s6-linux-init-hpr -p $@
diff --git a/s6/base/bin/reboot b/s6/base/bin/reboot
deleted file mode 100755
index 8e82d11..0000000
--- a/s6/base/bin/reboot
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/execlineb -S0
-
-s6-linux-init-hpr -r $@
diff --git a/s6/base/bin/shutdown b/s6/base/bin/shutdown
deleted file mode 100755
index 6c1b0c3..0000000
--- a/s6/base/bin/shutdown
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/execlineb -S0
-
-s6-linux-init-shutdown $@
diff --git a/s6/base/bin/telinit b/s6/base/bin/telinit
deleted file mode 100755
index 823def0..0000000
--- a/s6/base/bin/telinit
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/execlineb -S0
-
-s6-linux-init-telinit $@
diff --git a/s6/base/run-image/service/.s6-svscan/SIGHUP b/s6/base/run-image/service/.s6-svscan/SIGHUP
deleted file mode 100755
index 130ab12..0000000
--- a/s6/base/run-image/service/.s6-svscan/SIGHUP
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/execlineb -P
-
diff --git a/s6/base/run-image/service/.s6-svscan/SIGINT b/s6/base/run-image/service/.s6-svscan/SIGINT
deleted file mode 100755
index 9a7eeaf..0000000
--- a/s6/base/run-image/service/.s6-svscan/SIGINT
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/execlineb -P
-
-s6-linux-init-shutdown -a -r -- now
diff --git a/s6/base/run-image/service/.s6-svscan/SIGPWR b/s6/base/run-image/service/.s6-svscan/SIGPWR
deleted file mode 100755
index bc55899..0000000
--- a/s6/base/run-image/service/.s6-svscan/SIGPWR
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/execlineb -P
-
-s6-linux-init-shutdown -a -p -- now
diff --git a/s6/base/run-image/service/.s6-svscan/SIGQUIT b/s6/base/run-image/service/.s6-svscan/SIGQUIT
deleted file mode 100755
index 130ab12..0000000
--- a/s6/base/run-image/service/.s6-svscan/SIGQUIT
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/execlineb -P
-
diff --git a/s6/base/run-image/service/.s6-svscan/SIGTERM b/s6/base/run-image/service/.s6-svscan/SIGTERM
deleted file mode 100755
index 130ab12..0000000
--- a/s6/base/run-image/service/.s6-svscan/SIGTERM
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/execlineb -P
-
diff --git a/s6/base/run-image/service/.s6-svscan/SIGUSR1 b/s6/base/run-image/service/.s6-svscan/SIGUSR1
deleted file mode 100755
index bc55899..0000000
--- a/s6/base/run-image/service/.s6-svscan/SIGUSR1
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/execlineb -P
-
-s6-linux-init-shutdown -a -p -- now
diff --git a/s6/base/run-image/service/.s6-svscan/SIGUSR2 b/s6/base/run-image/service/.s6-svscan/SIGUSR2
deleted file mode 100755
index 5bbca00..0000000
--- a/s6/base/run-image/service/.s6-svscan/SIGUSR2
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/execlineb -P
-
-s6-linux-init-shutdown -a -h -- now
diff --git a/s6/base/run-image/service/.s6-svscan/SIGWINCH b/s6/base/run-image/service/.s6-svscan/SIGWINCH
deleted file mode 100755
index 130ab12..0000000
--- a/s6/base/run-image/service/.s6-svscan/SIGWINCH
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/execlineb -P
-
diff --git a/s6/base/run-image/service/.s6-svscan/crash b/s6/base/run-image/service/.s6-svscan/crash
deleted file mode 100755
index e5a9440..0000000
--- a/s6/base/run-image/service/.s6-svscan/crash
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/execlineb -P
-
-redirfd -w 2 /dev/console
-fdmove -c 1 2
-foreground { s6-linux-init-echo -- "s6-svscan crashed. Rebooting." }
-s6-linux-init-hpr -fr
diff --git a/s6/base/run-image/service/.s6-svscan/finish b/s6/base/run-image/service/.s6-svscan/finish
deleted file mode 100755
index ad17596..0000000
--- a/s6/base/run-image/service/.s6-svscan/finish
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/execlineb -P
-
-redirfd -w 2 /dev/console
-fdmove -c 1 2
-foreground { s6-linux-init-echo -- "s6-svscan exited. Rebooting." }
-s6-linux-init-hpr -fr
diff --git a/s6/base/run-image/service/s6-linux-init-early-getty/run b/s6/base/run-image/service/s6-linux-init-early-getty/run
deleted file mode 100755
index 646423b..0000000
--- a/s6/base/run-image/service/s6-linux-init-early-getty/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/execlineb -P
-
-/sbin/agetty -L -8 tty1 115200
diff --git a/s6/base/run-image/service/s6-linux-init-logouthookd/notification-fd b/s6/base/run-image/service/s6-linux-init-logouthookd/notification-fd
deleted file mode 100644
index d00491f..0000000
--- a/s6/base/run-image/service/s6-linux-init-logouthookd/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/s6/base/run-image/service/s6-linux-init-logouthookd/run b/s6/base/run-image/service/s6-linux-init-logouthookd/run
deleted file mode 100755
index 9698c56..0000000
--- a/s6/base/run-image/service/s6-linux-init-logouthookd/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/execlineb -P
-
-s6-ipcserver -1 -a 0700 -c 1000 -C 1000 -- s
-s6-linux-init-logouthookd
diff --git a/s6/base/run-image/service/s6-linux-init-runleveld/notification-fd b/s6/base/run-image/service/s6-linux-init-runleveld/notification-fd
deleted file mode 100644
index 00750ed..0000000
--- a/s6/base/run-image/service/s6-linux-init-runleveld/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/s6/base/run-image/service/s6-linux-init-runleveld/run b/s6/base/run-image/service/s6-linux-init-runleveld/run
deleted file mode 100755
index 1196d8d..0000000
--- a/s6/base/run-image/service/s6-linux-init-runleveld/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/execlineb -P
-
-fdmove -c 2 1
-fdmove 1 3
-s6-ipcserver -1 -a 0700 -c 1 -- s
-s6-sudod -dt30000 --
-"/etc/s6/base"/scripts/runlevel
diff --git a/s6/base/run-image/service/s6-linux-init-shutdownd/run b/s6/base/run-image/service/s6-linux-init-shutdownd/run
deleted file mode 100755
index 8258d75..0000000
--- a/s6/base/run-image/service/s6-linux-init-shutdownd/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/execlineb -P
-
-s6-linux-init-shutdownd -c "/etc/s6/base" -g 3000
diff --git a/s6/base/run-image/service/s6-svscan-log/notification-fd b/s6/base/run-image/service/s6-svscan-log/notification-fd
deleted file mode 100644
index 00750ed..0000000
--- a/s6/base/run-image/service/s6-svscan-log/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/s6/base/run-image/service/s6-svscan-log/run b/s6/base/run-image/service/s6-svscan-log/run
deleted file mode 100755
index 7028d1b..0000000
--- a/s6/base/run-image/service/s6-svscan-log/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/execlineb -P
-
-redirfd -w 1 /dev/null
-redirfd -rnb 0 fifo
-s6-log -bpd3 -- T /run/uncaught-logs
diff --git a/s6/base/run-image/service/utmpd/notification-fd b/s6/base/run-image/service/utmpd/notification-fd
deleted file mode 100644
index 00750ed..0000000
--- a/s6/base/run-image/service/utmpd/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/s6/base/run-image/service/utmpd/run b/s6/base/run-image/service/utmpd/run
deleted file mode 100755
index 35c60c5..0000000
--- a/s6/base/run-image/service/utmpd/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/execlineb -P
-
-fdmove -c 2 1
-s6-setuidgid "utmp"
-cd /run/utmps
-fdmove 1 3
-s6-ipcserver -1 -c 1000 -- /run/utmps/.utmpd-socket
-utmps-utmpd
diff --git a/s6/base/run-image/service/wtmpd/notification-fd b/s6/base/run-image/service/wtmpd/notification-fd
deleted file mode 100644
index 00750ed..0000000
--- a/s6/base/run-image/service/wtmpd/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/s6/base/run-image/service/wtmpd/run b/s6/base/run-image/service/wtmpd/run
deleted file mode 100755
index 79815bb..0000000
--- a/s6/base/run-image/service/wtmpd/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/execlineb -P
-
-fdmove -c 2 1
-s6-setuidgid "utmp"
-cd /run/utmps
-fdmove 1 3
-s6-ipcserver -1 -c 1000 -- /run/utmps/.wtmpd-socket
-utmps-wtmpd
diff --git a/s6/base/scripts/rc.init b/s6/base/scripts/rc.init
deleted file mode 100755
index 56c3e7b..0000000
--- a/s6/base/scripts/rc.init
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh -e
-
-rl="$1"
-shift
-
-### argv now contains the arguments of the kernel command line that are
-### not of the form key=value. (The key=value arguments were stored by
-### s6-linux-init into an envdir, if instructed so via the -s option.)
-### Normally this argv remains unused because programs that need the
-### kernel command line usually read it later on from /proc/cmdline -
-### but just in case, it's available here.
-
-
-### 1. Early preparation
-### This is done only once at boot time.
-### Ideally, this phase should just initialize the service manager.
-
-### If your services are managed by sysv-rc:
-# /etc/init.d/rcS
-
-### If your services are managed by OpenRC:
-# /sbin/openrc sysinit
-# /sbin/openrc boot
-
-### If your services are managed by s6-rc:
-### (replace /run/service with your scandir)
-s6-rc-init -c /etc/s6/db/current /run/service
-
-
-### 2. Starting the wanted set of services
-### This is also called every time you change runlevels with telinit.
-### (edit the location to suit your installation)
-### By default, $rl is the string "default", unless you changed it
-### via the -D option to s6-linux-init-maker.
-### Numeric arguments from 1 to 5 on the kernel command line will
-### override the default.
-
-exec /etc/s6/base/scripts/runlevel "$rl"
-
-
-### If this script is run in a container, then 1. and 2. above do not
-### apply and you should just call your CMD, if any, or let your
-### services run.
-### Something like this:
-
-# if test -z "$*" ; then return 0 ; fi
-# $@
-# echo $? > /run/s6-linux-init-container-results/exitcode
-# halt
diff --git a/s6/base/scripts/rc.shutdown b/s6/base/scripts/rc.shutdown
deleted file mode 100755
index f759ba7..0000000
--- a/s6/base/scripts/rc.shutdown
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh -e
-
-### Things to do before hardware halt/reboot/poweroff.
-### Ideally, it should be a single call to the service manager,
-### telling it to bring all the services down.
-
-### If your s6-linux-init-maker invocation was made with the -1
-### option, messages from rc.shutdown will appear on /dev/console
-### as well as be logged by the catch-all logger.
-### If your s6-linux-init-maker invocation did NOT include the -1
-### option, messages from rc.shutdown will only be logged by the
-### catch-all logger and will NOT appear on /dev/console. In order
-### to print them to /dev/console instead, you may want to
-### uncomment the following line:
-exec >/dev/console 2>&1
-
-### If your services are managed by sysv-rc:
-### also remove the K11reboot link from /etc/rc6.d to prevent
-### sysv-rc from rebooting prematurely - because sysvinit does
-### not properly separate state changes from system init/shutdown.
-# exec /etc/init.d/rc 6
-
-### If your services are managed by OpenRC:
-### also remove the "killprocs" and "mount-ro" symlinks from
-### /etc/runlevels/shutdown - because OpenRC does not properly
-### separate the service manager from the shutdown manager either.
-# exec /sbin/openrc shutdown
-
-### If your services are managed by s6-rc:
-exec s6-rc -v2 -bda change
diff --git a/s6/base/scripts/rc.shutdown.final b/s6/base/scripts/rc.shutdown.final
deleted file mode 100755
index 3f46b87..0000000
--- a/s6/base/scripts/rc.shutdown.final
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-### Things to do *right before* the machine gets rebooted or
-### powered off, at the very end of the shutdown sequence,
-### when all the filesystems are unmounted.
-
-### This is a last resort hook; normally nothing should be
-### done here (your rc.shutdown script should have taken care
-### of everything) and you should leave this script empty.
-
-### Some distributions, however, may need to perform some
-### actions after unmounting the filesystems: typically if
-### an additional teardown action is required on a filesystem
-### after unmounting it, or if the system needs to be
-### pivot_rooted before it can be shut down, etc.
-
-### Those are all exceptional cases. If you don't know for
-### certain that you need to do something here, you don't.
diff --git a/s6/base/scripts/runlevel b/s6/base/scripts/runlevel
deleted file mode 100755
index d266171..0000000
--- a/s6/base/scripts/runlevel
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-### This script is called once at boot time by rc.init, and is
-### also called by the runleveld service every time the user
-### requests a machine state change via telinit.
-### Ideally, it should just be a call to the service manager.
-
-test "$#" -gt 0 || { echo 'runlevel: fatal: too few arguments' 1>&2 ; exit 100 ; }
-
-
-### If your services are managed by sysv-rc:
-# exec /etc/init.d/rc "$1"
-
-### If your services are managed by OpenRC:
-# exec /sbin/openrc "$1"
-
-### If your services are managed by s6-rc:
-exec s6-rc -v2 -up change "$1"