reorganised

32 files changed, 67 insertions, 0 deletions

diff --git a/xi/s6/db/basic/db b/xi/s6/db/basic/db
new file mode 100644
index 0000000..e85e344
--- /dev/null
+++ b/xi/s6/db/basic/db
diff --git a/xi/s6/db/basic/lock b/xi/s6/db/basic/lock
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/xi/s6/db/basic/lock
diff --git a/xi/s6/db/basic/n b/xi/s6/db/basic/n
new file mode 100644
index 0000000..806eabf
--- /dev/null
+++ b/xi/s6/db/basic/n
diff --git a/xi/s6/db/basic/resolve.cdb b/xi/s6/db/basic/resolve.cdb
new file mode 100644
index 0000000..62fe7a8
--- /dev/null
+++ b/xi/s6/db/basic/resolve.cdb
diff --git a/xi/s6/db/basic/servicedirs/agetty2/run b/xi/s6/db/basic/servicedirs/agetty2/run
new file mode 100755
index 0000000..6562e22
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/agetty2/run
@@ -0,0 +1,2 @@
+#!/bin/execlineb -P
+exec /sbin/agetty -L -8 tty2 115200
diff --git a/xi/s6/db/basic/servicedirs/agetty3/run b/xi/s6/db/basic/servicedirs/agetty3/run
new file mode 100755
index 0000000..a6117c5
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/agetty3/run
@@ -0,0 +1,2 @@
+#!/bin/execlineb -P
+exec /sbin/agetty -L -8 tty3 115200
diff --git a/xi/s6/db/basic/servicedirs/agetty4/run b/xi/s6/db/basic/servicedirs/agetty4/run
new file mode 100755
index 0000000..1176c91
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/agetty4/run
@@ -0,0 +1,2 @@
+#!/bin/execlineb -P
+exec /sbin/agetty -L -8 tty4 115200
diff --git a/xi/s6/db/basic/servicedirs/agetty5/run b/xi/s6/db/basic/servicedirs/agetty5/run
new file mode 100755
index 0000000..c720902
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/agetty5/run
@@ -0,0 +1,2 @@
+#!/bin/execlineb -P
+exec /sbin/agetty -L -8 tty5 115200
diff --git a/xi/s6/db/basic/servicedirs/agetty6/run b/xi/s6/db/basic/servicedirs/agetty6/run
new file mode 100755
index 0000000..9d0fc1a
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/agetty6/run
@@ -0,0 +1,2 @@
+#!/bin/execlineb -P
+exec /sbin/agetty -L -8 tty6 115200
diff --git a/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/autofilled b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/autofilled
new file mode 100644
index 0000000..5a7694f
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/autofilled
@@ -0,0 +1 @@
+udevd-log
diff --git a/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/gid/0/allow b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/gid/0/allow
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/gid/0/allow
diff --git a/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/gid/0/env b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/gid/0/env
new file mode 120000
index 0000000..dbe1277
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/gid/0/env
@@ -0,0 +1 @@
+../../uid/0/env
\ No newline at end of file
diff --git a/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/allow b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/allow
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/allow
diff --git a/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_GETDUMP b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_GETDUMP
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_GETDUMP
@@ -0,0 +1 @@
+
diff --git a/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_LIST b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_LIST
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_LIST
@@ -0,0 +1 @@
+
diff --git a/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_RETRIEVE_REGEX b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_RETRIEVE_REGEX
new file mode 120000
index 0000000..8534683
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_RETRIEVE_REGEX
@@ -0,0 +1 @@
+S6_FDHOLDER_STORE_REGEX
\ No newline at end of file
diff --git a/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_SETDUMP b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_SETDUMP
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_SETDUMP
@@ -0,0 +1 @@
+
diff --git a/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_STORE_REGEX b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_STORE_REGEX
new file mode 100644
index 0000000..d1e45dc
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/0/env/S6_FDHOLDER_STORE_REGEX
@@ -0,0 +1 @@
+^pipe:s6rc-
diff --git a/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/self b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/self
new file mode 120000
index 0000000..c227083
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-fdholder/data/rules/uid/self
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/xi/s6/db/basic/servicedirs/s6rc-fdholder/notification-fd b/xi/s6/db/basic/servicedirs/s6rc-fdholder/notification-fd
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-fdholder/notification-fd
@@ -0,0 +1 @@
+1
diff --git a/xi/s6/db/basic/servicedirs/s6rc-fdholder/run b/xi/s6/db/basic/servicedirs/s6rc-fdholder/run
new file mode 100755
index 0000000..0a400c7
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-fdholder/run
@@ -0,0 +1,17 @@
+#!/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/xi/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/gid/0/allow b/xi/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/gid/0/allow
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/gid/0/allow
diff --git a/xi/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/uid/0/allow b/xi/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/uid/0/allow
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/uid/0/allow
diff --git a/xi/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/uid/self b/xi/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/uid/self
new file mode 120000
index 0000000..c227083
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-oneshot-runner/data/rules/uid/self
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/xi/s6/db/basic/servicedirs/s6rc-oneshot-runner/notification-fd b/xi/s6/db/basic/servicedirs/s6rc-oneshot-runner/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-oneshot-runner/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/xi/s6/db/basic/servicedirs/s6rc-oneshot-runner/run b/xi/s6/db/basic/servicedirs/s6rc-oneshot-runner/run
new file mode 100755
index 0000000..d819a25
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/s6rc-oneshot-runner/run
@@ -0,0 +1,8 @@
+#!/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/xi/s6/db/basic/servicedirs/udevd-log/notification-fd b/xi/s6/db/basic/servicedirs/udevd-log/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/udevd-log/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/xi/s6/db/basic/servicedirs/udevd-log/run b/xi/s6/db/basic/servicedirs/udevd-log/run
new file mode 100755
index 0000000..a8ac83f
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/udevd-log/run
@@ -0,0 +1,3 @@
+#!/bin/execlineb -P
+s6-fdholder-retrieve ../s6rc-fdholder/s "pipe:s6rc-r-udevd-log"
+./run.user
diff --git a/xi/s6/db/basic/servicedirs/udevd-log/run.user b/xi/s6/db/basic/servicedirs/udevd-log/run.user
new file mode 100755
index 0000000..0bf9ad7
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/udevd-log/run.user
@@ -0,0 +1,5 @@
+#!/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/xi/s6/db/basic/servicedirs/udevd-srv/run b/xi/s6/db/basic/servicedirs/udevd-srv/run
new file mode 100755
index 0000000..f5f8202
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/udevd-srv/run
@@ -0,0 +1,5 @@
+#!/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/xi/s6/db/basic/servicedirs/udevd-srv/run.user b/xi/s6/db/basic/servicedirs/udevd-srv/run.user
new file mode 100755
index 0000000..fea1782
--- /dev/null
+++ b/xi/s6/db/basic/servicedirs/udevd-srv/run.user
@@ -0,0 +1,6 @@
+#!/bin/execlineb -P
+# Initiate udev
+fdmove -c 2 1
+if { s6-echo -- "[  udev-daemon   ] 1/1 : Starting udev..."  }
+exec -c
+udevd
diff --git a/xi/s6/db/current b/xi/s6/db/current
new file mode 120000
index 0000000..5dc1ed1
--- /dev/null
+++ b/xi/s6/db/current
@@ -0,0 +1 @@
+/etc/s6/db/basic
\ No newline at end of file