summaryrefslogtreecommitdiff
path: root/examples/ROOT/img/tmpfs
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-01-24 17:48:24 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-01-24 17:48:24 +0000
commit917fab4b4ddf202b078eae83de3e1311f2111cfa (patch)
tree812bb6f665bd05772bf6531482cae965acd6dca2 /examples/ROOT/img/tmpfs
parent5b7777a52d0b70b6094547c7cb4056aa9664f69d (diff)
downloads6-917fab4b4ddf202b078eae83de3e1311f2111cfa.tar.xz
Delete obsolete examples/ROOT, refer to s6-linux-init instead
Diffstat (limited to 'examples/ROOT/img/tmpfs')
-rw-r--r--examples/ROOT/img/tmpfs/README9
-rw-r--r--examples/ROOT/img/tmpfs/dev/README4
-rw-r--r--examples/ROOT/img/tmpfs/dev/pts/README2
l---------examples/ROOT/img/tmpfs/dev/shm1
-rw-r--r--examples/ROOT/img/tmpfs/service/.s6-svscan/README9
-rwxr-xr-xexamples/ROOT/img/tmpfs/service/.s6-svscan/SIGINT3
-rwxr-xr-xexamples/ROOT/img/tmpfs/service/.s6-svscan/SIGUSR13
-rwxr-xr-xexamples/ROOT/img/tmpfs/service/.s6-svscan/SIGUSR23
-rwxr-xr-xexamples/ROOT/img/tmpfs/service/.s6-svscan/crash13
l---------examples/ROOT/img/tmpfs/service/.s6-svscan/finish1
-rw-r--r--examples/ROOT/img/tmpfs/service/README5
-rw-r--r--examples/ROOT/img/tmpfs/service/getty/README2
-rwxr-xr-xexamples/ROOT/img/tmpfs/service/getty/run2
-rw-r--r--examples/ROOT/img/tmpfs/service/s6-svscan-log/README9
-rwxr-xr-xexamples/ROOT/img/tmpfs/service/s6-svscan-log/run13
-rw-r--r--examples/ROOT/img/tmpfs/shm/README3
-rw-r--r--examples/ROOT/img/tmpfs/tmp/README4
-rw-r--r--examples/ROOT/img/tmpfs/tmp/uncaught-logs/README4
18 files changed, 0 insertions, 90 deletions
diff --git a/examples/ROOT/img/tmpfs/README b/examples/ROOT/img/tmpfs/README
deleted file mode 100644
index 0a9035d..0000000
--- a/examples/ROOT/img/tmpfs/README
+++ /dev/null
@@ -1,9 +0,0 @@
-/img/tmpfs is the hierarchy that will be copied to /mnt/tmpfs
-during stage 1 init, so the basics are covered for stage 2:
- - /dev points to a real, writable device directory
- - /tmp points to a real, writable temporary directory
- - /service points to a real, writable scan directory that
-already contains basic services (s6-svscan's own logger and
-an early getty)
- - /mnt/tmpfs/uncaught-logs is the place in RAM where the
-catch-all logger stores and rotates its logs.
diff --git a/examples/ROOT/img/tmpfs/dev/README b/examples/ROOT/img/tmpfs/dev/README
deleted file mode 100644
index 8b944ff..0000000
--- a/examples/ROOT/img/tmpfs/dev/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory is the /dev image.
-It should contain all your static devices.
-It MUST contain at least /dev/null and /dev/console,
-else the system will crash during stage 1 init.
diff --git a/examples/ROOT/img/tmpfs/dev/pts/README b/examples/ROOT/img/tmpfs/dev/pts/README
deleted file mode 100644
index e0553f0..0000000
--- a/examples/ROOT/img/tmpfs/dev/pts/README
+++ /dev/null
@@ -1,2 +0,0 @@
-The place (after it's copied to the tmpfs) where
-the virtual devpts filesystem will be mounted.
diff --git a/examples/ROOT/img/tmpfs/dev/shm b/examples/ROOT/img/tmpfs/dev/shm
deleted file mode 120000
index c71cdc8..0000000
--- a/examples/ROOT/img/tmpfs/dev/shm
+++ /dev/null
@@ -1 +0,0 @@
-../shm \ No newline at end of file
diff --git a/examples/ROOT/img/tmpfs/service/.s6-svscan/README b/examples/ROOT/img/tmpfs/service/.s6-svscan/README
deleted file mode 100644
index f61dc8d..0000000
--- a/examples/ROOT/img/tmpfs/service/.s6-svscan/README
+++ /dev/null
@@ -1,9 +0,0 @@
-This is the image of the control directory of the s6-svscan process
-running as pid 1.
-"crash" is run if s6-svscan fails.
-"finish" is run when s6-svscan exits its loop.
-
- The "SIG*" files are run as children of s6-svscan when it receives
-the corresponding signal. SIGINT, SIGUSR1 and SIGUSR2 will all
-trigger "s6-rc -da change" (the service manager will shut down all
-the services), then s6-svscan will be told to exit its loop.
diff --git a/examples/ROOT/img/tmpfs/service/.s6-svscan/SIGINT b/examples/ROOT/img/tmpfs/service/.s6-svscan/SIGINT
deleted file mode 100755
index f0ff213..0000000
--- a/examples/ROOT/img/tmpfs/service/.s6-svscan/SIGINT
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/command/execlineb -P
-foreground { s6-rc -da change }
-s6-svscanctl -6 .
diff --git a/examples/ROOT/img/tmpfs/service/.s6-svscan/SIGUSR1 b/examples/ROOT/img/tmpfs/service/.s6-svscan/SIGUSR1
deleted file mode 100755
index cb4a4ef..0000000
--- a/examples/ROOT/img/tmpfs/service/.s6-svscan/SIGUSR1
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/command/execlineb -P
-foreground { s6-rc -da change }
-s6-svscanctl -0 .
diff --git a/examples/ROOT/img/tmpfs/service/.s6-svscan/SIGUSR2 b/examples/ROOT/img/tmpfs/service/.s6-svscan/SIGUSR2
deleted file mode 100755
index e5932be..0000000
--- a/examples/ROOT/img/tmpfs/service/.s6-svscan/SIGUSR2
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/command/execlineb -P
-foreground { s6-rc -da change }
-s6-svscanctl -7 .
diff --git a/examples/ROOT/img/tmpfs/service/.s6-svscan/crash b/examples/ROOT/img/tmpfs/service/.s6-svscan/crash
deleted file mode 100755
index 501e316..0000000
--- a/examples/ROOT/img/tmpfs/service/.s6-svscan/crash
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/command/execlineb -P
-
-# This file is run when an unrecoverable error happens
-# to s6-svscan. Edit it to suit your needs.
-
-cd /
-redirfd -r 0 /dev/console
-redirfd -w 1 /dev/console
-fdmove -c 2 1
-
-foreground { s6-echo "s6-svscan panicked! Dropping to a root shell.\n" }
-
-/bin/sh -i
diff --git a/examples/ROOT/img/tmpfs/service/.s6-svscan/finish b/examples/ROOT/img/tmpfs/service/.s6-svscan/finish
deleted file mode 120000
index feb771e..0000000
--- a/examples/ROOT/img/tmpfs/service/.s6-svscan/finish
+++ /dev/null
@@ -1 +0,0 @@
-/etc/s6-init/init-stage3 \ No newline at end of file
diff --git a/examples/ROOT/img/tmpfs/service/README b/examples/ROOT/img/tmpfs/service/README
deleted file mode 100644
index dab0447..0000000
--- a/examples/ROOT/img/tmpfs/service/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This is the initial image of the scan directory.
-When init executes into s6-svscan, s6-svscan will immediately
-start the "s6-svscan-log" service, which logs s6-svscan's own
-output, and the "getty1" service, which spawns a getty on
-tty1 as early as possible, in case debugging is needed.
diff --git a/examples/ROOT/img/tmpfs/service/getty/README b/examples/ROOT/img/tmpfs/service/getty/README
deleted file mode 100644
index efb079b..0000000
--- a/examples/ROOT/img/tmpfs/service/getty/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This service is started very early, to make sure a tty exists as soon
-as s6-svscan is run, so early debugging is possible.
diff --git a/examples/ROOT/img/tmpfs/service/getty/run b/examples/ROOT/img/tmpfs/service/getty/run
deleted file mode 100755
index 3240ffd..0000000
--- a/examples/ROOT/img/tmpfs/service/getty/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/command/execlineb -P
-getty -L -H DEBUG 38400 tty1
diff --git a/examples/ROOT/img/tmpfs/service/s6-svscan-log/README b/examples/ROOT/img/tmpfs/service/s6-svscan-log/README
deleted file mode 100644
index 282d4f0..0000000
--- a/examples/ROOT/img/tmpfs/service/s6-svscan-log/README
+++ /dev/null
@@ -1,9 +0,0 @@
-This service reads from the "fifo" named pipe and logs
-what it reads to the /tmp/uncaught-logs log directory.
-The whole supervision tree has its stderr redirected to "fifo",
-as well as services that do not have their own logger.
-So, /tmp/uncaught-logs is the catch-all logger: logs that aren't
-caught anywhere else end up there.
-
- You should create the "fifo" named pipe in this directory,
-belonging to nobody:nogroup with rights 0622.
diff --git a/examples/ROOT/img/tmpfs/service/s6-svscan-log/run b/examples/ROOT/img/tmpfs/service/s6-svscan-log/run
deleted file mode 100755
index 47eb828..0000000
--- a/examples/ROOT/img/tmpfs/service/s6-svscan-log/run
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/command/execlineb -P
-redirfd -w 2 /dev/console
-redirfd -rnb 0 fifo
-s6-setuidgid nobody
-exec -c
-s6-log -bp t /mnt/tmpfs/uncaught-logs
-
-# The -p option is important:
-# even if s6-svscan is told to kill everything,
-# you do not want this logger to die.
-# The -b option ensures s6-log processes lines one
-# at a time, so it doesn't eat up too much memory
-# in case of a problem spike.
diff --git a/examples/ROOT/img/tmpfs/shm/README b/examples/ROOT/img/tmpfs/shm/README
deleted file mode 100644
index 7ef7853..0000000
--- a/examples/ROOT/img/tmpfs/shm/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This directory exists so /dev/shm points to a place
-in the tmpfs.
-It should have "1777" rights.
diff --git a/examples/ROOT/img/tmpfs/tmp/README b/examples/ROOT/img/tmpfs/tmp/README
deleted file mode 100644
index 1e437a0..0000000
--- a/examples/ROOT/img/tmpfs/tmp/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory contains what will be /mnt/tmpfs/tmp after
-stage 1 init, so it contains everything /tmp should point
-to.
-It should have "1777" rights.
diff --git a/examples/ROOT/img/tmpfs/tmp/uncaught-logs/README b/examples/ROOT/img/tmpfs/tmp/uncaught-logs/README
deleted file mode 100644
index c13d539..0000000
--- a/examples/ROOT/img/tmpfs/tmp/uncaught-logs/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory should not belong to root, but to nobody:nogroup;
-it should also have "2700" rights.
-It is the catch-all logdir.
-/tmp/uncaught-logs/current will be the current catch-all log file.