diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-04-28 11:12:56 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-04-28 11:30:48 +0000 |
| commit | e04434c1e90a1441ad3dc02893ab98ef3be71ffb (patch) | |
| tree | 5579e50ed57ed278d381ac092efe98b7af9d09fd /vm/app/catgirl/default.nix | |
| parent | 4adae7e7cd86b2f8e2cc140c02760922ee8258a9 (diff) | |
| download | spectrum-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/default.nix')
| -rw-r--r-- | vm/app/catgirl/default.nix | 5 |
1 files changed, 3 insertions, 2 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 = '' |