From ea4267fac55c7d8a6093a6b03ff0e9c795786d3e Mon Sep 17 00:00:00 2001 From: davidovski Date: Tue, 1 Mar 2022 23:14:41 +0000 Subject: reorganised --- s6/base/run-image/service/.s6-svscan/SIGHUP | 2 -- s6/base/run-image/service/.s6-svscan/SIGINT | 3 --- s6/base/run-image/service/.s6-svscan/SIGPWR | 3 --- s6/base/run-image/service/.s6-svscan/SIGQUIT | 2 -- s6/base/run-image/service/.s6-svscan/SIGTERM | 2 -- s6/base/run-image/service/.s6-svscan/SIGUSR1 | 3 --- s6/base/run-image/service/.s6-svscan/SIGUSR2 | 3 --- s6/base/run-image/service/.s6-svscan/SIGWINCH | 2 -- s6/base/run-image/service/.s6-svscan/crash | 6 ------ s6/base/run-image/service/.s6-svscan/finish | 6 ------ s6/base/run-image/service/s6-linux-init-early-getty/run | 3 --- .../run-image/service/s6-linux-init-logouthookd/notification-fd | 1 - s6/base/run-image/service/s6-linux-init-logouthookd/run | 4 ---- s6/base/run-image/service/s6-linux-init-runleveld/notification-fd | 1 - s6/base/run-image/service/s6-linux-init-runleveld/run | 7 ------- s6/base/run-image/service/s6-linux-init-shutdownd/run | 3 --- s6/base/run-image/service/s6-svscan-log/notification-fd | 1 - s6/base/run-image/service/s6-svscan-log/run | 5 ----- s6/base/run-image/service/utmpd/notification-fd | 1 - s6/base/run-image/service/utmpd/run | 8 -------- s6/base/run-image/service/wtmpd/notification-fd | 1 - s6/base/run-image/service/wtmpd/run | 8 -------- 22 files changed, 75 deletions(-) delete mode 100755 s6/base/run-image/service/.s6-svscan/SIGHUP delete mode 100755 s6/base/run-image/service/.s6-svscan/SIGINT delete mode 100755 s6/base/run-image/service/.s6-svscan/SIGPWR delete mode 100755 s6/base/run-image/service/.s6-svscan/SIGQUIT delete mode 100755 s6/base/run-image/service/.s6-svscan/SIGTERM delete mode 100755 s6/base/run-image/service/.s6-svscan/SIGUSR1 delete mode 100755 s6/base/run-image/service/.s6-svscan/SIGUSR2 delete mode 100755 s6/base/run-image/service/.s6-svscan/SIGWINCH delete mode 100755 s6/base/run-image/service/.s6-svscan/crash delete mode 100755 s6/base/run-image/service/.s6-svscan/finish delete mode 100755 s6/base/run-image/service/s6-linux-init-early-getty/run delete mode 100644 s6/base/run-image/service/s6-linux-init-logouthookd/notification-fd delete mode 100755 s6/base/run-image/service/s6-linux-init-logouthookd/run delete mode 100644 s6/base/run-image/service/s6-linux-init-runleveld/notification-fd delete mode 100755 s6/base/run-image/service/s6-linux-init-runleveld/run delete mode 100755 s6/base/run-image/service/s6-linux-init-shutdownd/run delete mode 100644 s6/base/run-image/service/s6-svscan-log/notification-fd delete mode 100755 s6/base/run-image/service/s6-svscan-log/run delete mode 100644 s6/base/run-image/service/utmpd/notification-fd delete mode 100755 s6/base/run-image/service/utmpd/run delete mode 100644 s6/base/run-image/service/wtmpd/notification-fd delete mode 100755 s6/base/run-image/service/wtmpd/run (limited to 's6/base/run-image/service') 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 -- cgit v1.2.1