summary refs log tree commit diff
path: root/vm/app/catgirl/etc/init
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2022-04-28 11:12:56 +0000
committerAlyssa Ross <hi@alyssa.is>2022-04-28 11:30:48 +0000
commite04434c1e90a1441ad3dc02893ab98ef3be71ffb (patch)
tree5579e50ed57ed278d381ac092efe98b7af9d09fd /vm/app/catgirl/etc/init
parent4adae7e7cd86b2f8e2cc140c02760922ee8258a9 (diff)
downloadspectrum-e04434c1e90a1441ad3dc02893ab98ef3be71ffb.tar
spectrum-e04434c1e90a1441ad3dc02893ab98ef3be71ffb.tar.gz
spectrum-e04434c1e90a1441ad3dc02893ab98ef3be71ffb.tar.bz2
spectrum-e04434c1e90a1441ad3dc02893ab98ef3be71ffb.tar.lz
spectrum-e04434c1e90a1441ad3dc02893ab98ef3be71ffb.tar.xz
spectrum-e04434c1e90a1441ad3dc02893ab98ef3be71ffb.tar.zst
spectrum-e04434c1e90a1441ad3dc02893ab98ef3be71ffb.zip
Switch stage1 init to s6-linux-init
The main improvement things brings is that it should resolve a rare
race condition in early boot, where s6-rc-init would run before
s6-svscan, and so the boot would hang because s6-rc would never end up
properly running.
Diffstat (limited to 'vm/app/catgirl/etc/init')
-rwxr-xr-xvm/app/catgirl/etc/init18
1 files changed, 3 insertions, 15 deletions
diff --git a/vm/app/catgirl/etc/init b/vm/app/catgirl/etc/init
index 9ead7ab..d67ecd1 100755
--- a/vm/app/catgirl/etc/init
+++ b/vm/app/catgirl/etc/init
@@ -1,17 +1,5 @@
-#!/bin/execlineb -P
+#!/bin/execlineb -s0
 # SPDX-License-Identifier: EUPL-1.2
-# SPDX-FileCopyrightText: 2020-2022 Alyssa Ross <hi@alyssa.is>
+# SPDX-FileCopyrightText: 2022 Alyssa Ross <hi@alyssa.is>
 
-/bin/export PATH /bin
-/bin/s6-setsid -qb --
-
-umask 022
-if { mount -t tmpfs -o mode=0755 tmpfs /run }
-if { s6-hiercopy /etc/s6-linux-init/run-image /run }
-emptyenv -p
-
-background { s6-setsid -- /etc/s6-linux-init/scripts/rc.init }
-
-unexport !
-cd /run/service
-s6-svscan
+/bin/s6-linux-init -Bc /etc/s6-linux-init -- $@