From ea4267fac55c7d8a6093a6b03ff0e9c795786d3e Mon Sep 17 00:00:00 2001 From: davidovski Date: Tue, 1 Mar 2022 23:14:41 +0000 Subject: reorganised --- s6/db/basic/db | Bin 9462 -> 0 bytes s6/db/basic/lock | 0 s6/db/basic/n | Bin 24 -> 0 bytes s6/db/basic/resolve.cdb | Bin 3922 -> 0 bytes s6/db/basic/servicedirs/agetty2/run | 2 -- s6/db/basic/servicedirs/agetty3/run | 2 -- s6/db/basic/servicedirs/agetty4/run | 2 -- s6/db/basic/servicedirs/agetty5/run | 2 -- s6/db/basic/servicedirs/agetty6/run | 2 -- s6/db/basic/servicedirs/s6rc-fdholder/data/autofilled | 1 - .../servicedirs/s6rc-fdholder/data/rules/gid/0/allow | 0 .../servicedirs/s6rc-fdholder/data/rules/gid/0/env | 1 - .../servicedirs/s6rc-fdholder/data/rules/uid/0/allow | 0 .../data/rules/uid/0/env/S6_FDHOLDER_GETDUMP | 1 - .../data/rules/uid/0/env/S6_FDHOLDER_LIST | 1 - .../data/rules/uid/0/env/S6_FDHOLDER_RETRIEVE_REGEX | 1 - .../data/rules/uid/0/env/S6_FDHOLDER_SETDUMP | 1 - .../data/rules/uid/0/env/S6_FDHOLDER_STORE_REGEX | 1 - .../servicedirs/s6rc-fdholder/data/rules/uid/self | 1 - s6/db/basic/servicedirs/s6rc-fdholder/notification-fd | 1 - s6/db/basic/servicedirs/s6rc-fdholder/run | 17 ----------------- .../s6rc-oneshot-runner/data/rules/gid/0/allow | 0 .../s6rc-oneshot-runner/data/rules/uid/0/allow | 0 .../s6rc-oneshot-runner/data/rules/uid/self | 1 - .../servicedirs/s6rc-oneshot-runner/notification-fd | 1 - s6/db/basic/servicedirs/s6rc-oneshot-runner/run | 8 -------- s6/db/basic/servicedirs/udevd-log/notification-fd | 1 - s6/db/basic/servicedirs/udevd-log/run | 3 --- s6/db/basic/servicedirs/udevd-log/run.user | 5 ----- s6/db/basic/servicedirs/udevd-srv/run | 5 ----- s6/db/basic/servicedirs/udevd-srv/run.user | 6 ------ 31 files changed, 66 deletions(-) delete mode 100644 s6/db/basic/db delete mode 100644 s6/db/basic/lock delete mode 100644 s6/db/basic/n delete mode 100644 s6/db/basic/resolve.cdb delete mode 100755 s6/db/basic/servicedirs/agetty2/run delete mode 100755 s6/db/basic/servicedirs/agetty3/run delete mode 100755 s6/db/basic/servicedirs/agetty4/run delete mode 100755 s6/db/basic/servicedirs/agetty5/run delete mode 100755 s6/db/basic/servicedirs/agetty6/run delete mode 100644 s6/db/basic/servicedirs/s6rc-fdholder/data/autofilled delete mode 100644 s6/db/basic/servicedirs/s6rc-fdholder/data/rules/gid/0/allow delete mode 120000 s6/db/basic/servicedirs/s6rc-fdholder/data/rules/gid/0/env delete mode 100644 s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/allow delete mode 100644 s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_GETDUMP delete mode 100644 s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_LIST delete mode 120000 s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_RETRIEVE_REGEX delete mode 100644 s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_SETDUMP delete mode 100644 s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_STORE_REGEX delete mode 120000 s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/self delete mode 100644 s6/db/basic/servicedirs/s6rc-fdholder/notification-fd delete mode 100755 s6/db/basic/servicedirs/s6rc-fdholder/run delete mode 100644 s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/gid/0/allow delete mode 100644 s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/uid/0/allow delete mode 120000 s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/uid/self delete mode 100644 s6/db/basic/servicedirs/s6rc-oneshot-runner/notification-fd delete mode 100755 s6/db/basic/servicedirs/s6rc-oneshot-runner/run delete mode 100644 s6/db/basic/servicedirs/udevd-log/notification-fd delete mode 100755 s6/db/basic/servicedirs/udevd-log/run delete mode 100755 s6/db/basic/servicedirs/udevd-log/run.user delete mode 100755 s6/db/basic/servicedirs/udevd-srv/run delete mode 100755 s6/db/basic/servicedirs/udevd-srv/run.user (limited to 's6/db/basic') diff --git a/s6/db/basic/db b/s6/db/basic/db deleted file mode 100644 index e85e344..0000000 Binary files a/s6/db/basic/db and /dev/null differ diff --git a/s6/db/basic/lock b/s6/db/basic/lock deleted file mode 100644 index e69de29..0000000 diff --git a/s6/db/basic/n b/s6/db/basic/n deleted file mode 100644 index 806eabf..0000000 Binary files a/s6/db/basic/n and /dev/null differ diff --git a/s6/db/basic/resolve.cdb b/s6/db/basic/resolve.cdb deleted file mode 100644 index 62fe7a8..0000000 Binary files a/s6/db/basic/resolve.cdb and /dev/null differ diff --git a/s6/db/basic/servicedirs/agetty2/run b/s6/db/basic/servicedirs/agetty2/run deleted file mode 100755 index 6562e22..0000000 --- a/s6/db/basic/servicedirs/agetty2/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/execlineb -P -exec /sbin/agetty -L -8 tty2 115200 diff --git a/s6/db/basic/servicedirs/agetty3/run b/s6/db/basic/servicedirs/agetty3/run deleted file mode 100755 index a6117c5..0000000 --- a/s6/db/basic/servicedirs/agetty3/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/execlineb -P -exec /sbin/agetty -L -8 tty3 115200 diff --git a/s6/db/basic/servicedirs/agetty4/run b/s6/db/basic/servicedirs/agetty4/run deleted file mode 100755 index 1176c91..0000000 --- a/s6/db/basic/servicedirs/agetty4/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/execlineb -P -exec /sbin/agetty -L -8 tty4 115200 diff --git a/s6/db/basic/servicedirs/agetty5/run b/s6/db/basic/servicedirs/agetty5/run deleted file mode 100755 index c720902..0000000 --- a/s6/db/basic/servicedirs/agetty5/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/execlineb -P -exec /sbin/agetty -L -8 tty5 115200 diff --git a/s6/db/basic/servicedirs/agetty6/run b/s6/db/basic/servicedirs/agetty6/run deleted file mode 100755 index 9d0fc1a..0000000 --- a/s6/db/basic/servicedirs/agetty6/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/execlineb -P -exec /sbin/agetty -L -8 tty6 115200 diff --git a/s6/db/basic/servicedirs/s6rc-fdholder/data/autofilled b/s6/db/basic/servicedirs/s6rc-fdholder/data/autofilled deleted file mode 100644 index 5a7694f..0000000 --- a/s6/db/basic/servicedirs/s6rc-fdholder/data/autofilled +++ /dev/null @@ -1 +0,0 @@ -udevd-log diff --git a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/gid/0/allow b/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/gid/0/allow deleted file mode 100644 index e69de29..0000000 diff --git a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/gid/0/env b/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/gid/0/env deleted file mode 120000 index dbe1277..0000000 --- a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/gid/0/env +++ /dev/null @@ -1 +0,0 @@ -../../uid/0/env \ No newline at end of file diff --git a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/allow b/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/allow deleted file mode 100644 index e69de29..0000000 diff --git a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_GETDUMP b/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_GETDUMP deleted file mode 100644 index 8b13789..0000000 --- a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_GETDUMP +++ /dev/null @@ -1 +0,0 @@ - diff --git a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_LIST b/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_LIST deleted file mode 100644 index 8b13789..0000000 --- a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_LIST +++ /dev/null @@ -1 +0,0 @@ - diff --git a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_RETRIEVE_REGEX b/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_RETRIEVE_REGEX deleted file mode 120000 index 8534683..0000000 --- a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_RETRIEVE_REGEX +++ /dev/null @@ -1 +0,0 @@ -S6_FDHOLDER_STORE_REGEX \ No newline at end of file diff --git a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_SETDUMP b/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_SETDUMP deleted file mode 100644 index 8b13789..0000000 --- a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_SETDUMP +++ /dev/null @@ -1 +0,0 @@ - diff --git a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_STORE_REGEX b/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_STORE_REGEX deleted file mode 100644 index d1e45dc..0000000 --- a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_STORE_REGEX +++ /dev/null @@ -1 +0,0 @@ -^pipe:s6rc- diff --git a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/self b/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/self deleted file mode 120000 index c227083..0000000 --- a/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/self +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/s6/db/basic/servicedirs/s6rc-fdholder/notification-fd b/s6/db/basic/servicedirs/s6rc-fdholder/notification-fd deleted file mode 100644 index d00491f..0000000 --- a/s6/db/basic/servicedirs/s6rc-fdholder/notification-fd +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/s6/db/basic/servicedirs/s6rc-fdholder/run b/s6/db/basic/servicedirs/s6rc-fdholder/run deleted file mode 100755 index 0a400c7..0000000 --- a/s6/db/basic/servicedirs/s6rc-fdholder/run +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/execlineb -P -pipeline -dw -- -{ - if -n -- - { - forstdin -x 1 -- i - exit 1 - } - if -nt -- - { - redirfd -r 0 ./data/autofilled - s6-ipcclient -l0 -- s - /lib/s6-rc/s6-rc-fdholder-filler -1 -- - } - s6-svc -t . -} -s6-fdholder-daemon -1 -i data/rules -- s diff --git a/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/gid/0/allow b/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/gid/0/allow deleted file mode 100644 index e69de29..0000000 diff --git a/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/uid/0/allow b/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/uid/0/allow deleted file mode 100644 index e69de29..0000000 diff --git a/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/uid/self b/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/uid/self deleted file mode 120000 index c227083..0000000 --- a/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/uid/self +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/s6/db/basic/servicedirs/s6rc-oneshot-runner/notification-fd b/s6/db/basic/servicedirs/s6rc-oneshot-runner/notification-fd deleted file mode 100644 index 00750ed..0000000 --- a/s6/db/basic/servicedirs/s6rc-oneshot-runner/notification-fd +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/s6/db/basic/servicedirs/s6rc-oneshot-runner/run b/s6/db/basic/servicedirs/s6rc-oneshot-runner/run deleted file mode 100755 index d819a25..0000000 --- a/s6/db/basic/servicedirs/s6rc-oneshot-runner/run +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/execlineb -P -fdmove -c 2 1 -fdmove 1 3 -s6-ipcserver-socketbinder -- s -s6-ipcserverd -1 -- -s6-ipcserver-access -v0 -E -l0 -i data/rules -- -s6-sudod -t 30000 -- -/lib/s6-rc/s6-rc-oneshot-run -l ../.. -- diff --git a/s6/db/basic/servicedirs/udevd-log/notification-fd b/s6/db/basic/servicedirs/udevd-log/notification-fd deleted file mode 100644 index 00750ed..0000000 --- a/s6/db/basic/servicedirs/udevd-log/notification-fd +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/s6/db/basic/servicedirs/udevd-log/run b/s6/db/basic/servicedirs/udevd-log/run deleted file mode 100755 index a8ac83f..0000000 --- a/s6/db/basic/servicedirs/udevd-log/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/execlineb -P -s6-fdholder-retrieve ../s6rc-fdholder/s "pipe:s6rc-r-udevd-log" -./run.user diff --git a/s6/db/basic/servicedirs/udevd-log/run.user b/s6/db/basic/servicedirs/udevd-log/run.user deleted file mode 100755 index 0bf9ad7..0000000 --- a/s6/db/basic/servicedirs/udevd-log/run.user +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/execlineb -P -foreground { if -n -t { test -d /var/log/udevd } install -d -m 0755 -o s6log -g s6log /var/log/udevd } -envfile /etc/s6/sv/udevd-log/conf -importas -sCiu DIRECTIVES DIRECTIVES -s6-setuidgid s6log exec -c s6-log -d3 -b -- ${DIRECTIVES} /var/log/udevd diff --git a/s6/db/basic/servicedirs/udevd-srv/run b/s6/db/basic/servicedirs/udevd-srv/run deleted file mode 100755 index f5f8202..0000000 --- a/s6/db/basic/servicedirs/udevd-srv/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/execlineb -P -fdmove 1 0 -s6-fdholder-retrieve ../s6rc-fdholder/s "pipe:s6rc-w-udevd-log" -fdswap 0 1 -./run.user diff --git a/s6/db/basic/servicedirs/udevd-srv/run.user b/s6/db/basic/servicedirs/udevd-srv/run.user deleted file mode 100755 index fea1782..0000000 --- a/s6/db/basic/servicedirs/udevd-srv/run.user +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/execlineb -P -# Initiate udev -fdmove -c 2 1 -if { s6-echo -- "[ udev-daemon ] 1/1 : Starting udev..." } -exec -c -udevd -- cgit v1.2.1