diff options
Diffstat (limited to 'vm')
| -rw-r--r-- | vm/app/catgirl/default.nix | 5 | ||||
| -rwxr-xr-x | vm/app/catgirl/etc/init | 18 | ||||
| -rw-r--r-- | vm/app/lynx/default.nix | 5 | ||||
| -rwxr-xr-x | vm/app/lynx/etc/init | 18 | ||||
| -rw-r--r-- | vm/sys/net/default.nix | 4 | ||||
| -rwxr-xr-x | vm/sys/net/etc/init | 18 |
6 files changed, 17 insertions, 51 deletions
diff --git a/vm/app/catgirl/default.nix b/vm/app/catgirl/default.nix index bf35d04..55cccf0 100644 --- a/vm/app/catgirl/default.nix +++ b/vm/app/catgirl/default.nix @@ -9,14 +9,15 @@ pkgs.pkgsStatic.callPackage ( { lib, stdenv, runCommand, writeReferencesToFile, buildPackages , s6-rc, tar2ext4 -, busybox, cacert, catgirl, execline, kmod, mdevd, s6, s6-portable-utils +, busybox, cacert, catgirl, execline, kmod, mdevd, s6, s6-linux-init +, s6-portable-utils }: let inherit (lib) cleanSource cleanSourceWith concatMapStringsSep; packages = [ - catgirl execline kmod mdevd s6 s6-portable-utils s6-rc + catgirl execline kmod mdevd s6 s6-linux-init s6-portable-utils s6-rc (busybox.override { extraConfig = '' 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 -- $@ diff --git a/vm/app/lynx/default.nix b/vm/app/lynx/default.nix index b188794..e74a96f 100644 --- a/vm/app/lynx/default.nix +++ b/vm/app/lynx/default.nix @@ -9,14 +9,15 @@ pkgs.pkgsStatic.callPackage ( { lib, stdenv, runCommand, writeReferencesToFile, buildPackages , s6-rc, tar2ext4 -, busybox, cacert, execline, kmod, lynx, mdevd, s6, s6-portable-utils +, busybox, cacert, execline, kmod, lynx, mdevd, s6, s6-linux-init +, s6-portable-utils }: let inherit (lib) cleanSource cleanSourceWith concatMapStringsSep; packages = [ - execline kmod lynx mdevd s6 s6-portable-utils s6-rc + execline kmod lynx mdevd s6 s6-linux-init s6-portable-utils s6-rc (busybox.override { extraConfig = '' diff --git a/vm/app/lynx/etc/init b/vm/app/lynx/etc/init index 9ead7ab..d67ecd1 100755 --- a/vm/app/lynx/etc/init +++ b/vm/app/lynx/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 -- $@ diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index 55ae9cb..097ce0e 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -10,7 +10,7 @@ pkgs.pkgsStatic.callPackage ( { lib, stdenv, runCommand, writeReferencesToFile, buildPackages , s6-rc, tar2ext4, xorg , busybox, connmanMinimal, dbus, execline, kmod, mdevd, nftables, s6 -, s6-portable-utils +, s6-linux-init, s6-portable-utils }: let @@ -19,7 +19,7 @@ let connman = connmanMinimal; packages = [ - connman dbus execline kmod mdevd s6 s6-portable-utils s6-rc + connman dbus execline kmod mdevd s6 s6-linux-init s6-portable-utils s6-rc (busybox.override { extraConfig = '' diff --git a/vm/sys/net/etc/init b/vm/sys/net/etc/init index 9ead7ab..d67ecd1 100755 --- a/vm/sys/net/etc/init +++ b/vm/sys/net/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 -- $@ |