diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-04-28 09:38:12 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-04-28 10:47:35 +0000 |
| commit | 4adae7e7cd86b2f8e2cc140c02760922ee8258a9 (patch) | |
| tree | b2965994cddd16801f6fbe14f0d8929053b8b939 /vm/app/catgirl | |
| parent | 538ae7a47c0d896cbdebc98fbcf11b9745013bcc (diff) | |
| download | spectrum-4adae7e7cd86b2f8e2cc140c02760922ee8258a9.tar spectrum-4adae7e7cd86b2f8e2cc140c02760922ee8258a9.tar.gz spectrum-4adae7e7cd86b2f8e2cc140c02760922ee8258a9.tar.bz2 spectrum-4adae7e7cd86b2f8e2cc140c02760922ee8258a9.tar.lz spectrum-4adae7e7cd86b2f8e2cc140c02760922ee8258a9.tar.xz spectrum-4adae7e7cd86b2f8e2cc140c02760922ee8258a9.tar.zst spectrum-4adae7e7cd86b2f8e2cc140c02760922ee8258a9.zip | |
Adapt to s6-linux-init structure
This is preparatory work before a switch to s6-linux-init.
Diffstat (limited to 'vm/app/catgirl')
| -rw-r--r-- | vm/app/catgirl/Makefile | 8 | ||||
| -rwxr-xr-x | vm/app/catgirl/etc/init | 16 | ||||
| -rwxr-xr-x | vm/app/catgirl/etc/s6-linux-init/scripts/rc.init | 10 |
3 files changed, 18 insertions, 16 deletions
diff --git a/vm/app/catgirl/Makefile b/vm/app/catgirl/Makefile index 3ee5842..0d90a01 100644 --- a/vm/app/catgirl/Makefile +++ b/vm/app/catgirl/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: EUPL-1.2 -# SPDX-FileCopyrightText: 2021 Alyssa Ross <hi@alyssa.is> +# SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is> # qemu-kvm is non-standard, but is present in at least Fedora and # Nixpkgs. If you don't have qemu-kvm, you'll need to set e.g. @@ -46,7 +46,8 @@ VM_FILES = \ etc/mdev.conf \ etc/mdev/iface \ etc/passwd \ - etc/resolv.conf + etc/resolv.conf \ + etc/s6-linux-init/scripts/rc.init # These are separate because they need to be included, but putting # them as make dependencies would confuse make. @@ -66,7 +67,8 @@ build/rootfs.tar: build/empty $(PACKAGES_TAR) $(VM_FILES) $(VM_BUILD_FILES) for m in $(VM_MOUNTPOINTS); do \ tar $(TARFLAGS) --append -hf $@ --xform="s,.*,$$m," build/empty ; \ done - tar $(TARFLAGS) --append -hf $@ --xform='s,.*,etc/service,' build/empty + tar $(TARFLAGS) --append -hf $@ \ + --xform='s,.*,etc/s6-linux-init/run-image/service,' build/empty VM_S6_RC_FILES = \ etc/s6-rc/catgirl/run \ diff --git a/vm/app/catgirl/etc/init b/vm/app/catgirl/etc/init index 4f3ed66..9ead7ab 100755 --- a/vm/app/catgirl/etc/init +++ b/vm/app/catgirl/etc/init @@ -1,26 +1,16 @@ #!/bin/execlineb -P # SPDX-License-Identifier: EUPL-1.2 -# SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is> +# SPDX-FileCopyrightText: 2020-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/service /run/service } +if { s6-hiercopy /etc/s6-linux-init/run-image /run } emptyenv -p -background { - s6-setsid -- - - if { s6-rc-init -c /etc/s6-rc /run/service } - - if { s6-mkdir -p /dev/pts /dev/shm } - - if { mount -a } - - s6-rc change ok-all -} +background { s6-setsid -- /etc/s6-linux-init/scripts/rc.init } unexport ! cd /run/service diff --git a/vm/app/catgirl/etc/s6-linux-init/scripts/rc.init b/vm/app/catgirl/etc/s6-linux-init/scripts/rc.init new file mode 100755 index 0000000..7b32d83 --- /dev/null +++ b/vm/app/catgirl/etc/s6-linux-init/scripts/rc.init @@ -0,0 +1,10 @@ +#!/bin/execlineb -P +# SPDX-License-Identifier: EUPL-1.2 +# SPDX-FileCopyrightText: 2020-2022 Alyssa Ross <hi@alyssa.is> + +if { s6-rc-init -c /etc/s6-rc /run/service } + +if { s6-mkdir -p /dev/pts /dev/shm } +if { mount -a } + +s6-rc change ok-all |