From 85f7f7293dc0bb6146c97dc5c97bb66d655cd40d Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Mon, 26 Sep 2022 21:11:07 +0100 Subject: [PATCH] add bin/init to s6-rc module ... which suggests it could be better named; init is from s6-linux-init not s6-rc --- make-image.nix | 11 +---------- modules/s6-rc.nix | 4 ++++ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/make-image.nix b/make-image.nix index 833c6e2..8a913fc 100644 --- a/make-image.nix +++ b/make-image.nix @@ -3,17 +3,9 @@ , busybox , buildPackages , callPackage -, execline -, lib , pseudofile , runCommand -, s6-init-bin , s6-init-files -, s6-linux-init -, s6-rc -, s6-rc-database -, stdenvNoCC -, writeScript , writeText } : config : let @@ -35,7 +27,6 @@ let /sys d 0555 root root /dev/pts d 0755 0 0 /etc/init.d d 0755 0 0 - /bin/init s 0755 0 0 ${s6-init-bin}/bin/init /bin/sh s 0755 0 0 ${busybox}/bin/sh /bin/busybox s 0755 0 0 ${busybox}/bin/busybox ''; @@ -44,7 +35,7 @@ let (config.environment.contents); storefs = callPackage { - # add pseudofiles to store so that the packages they + # add pseudofiles as packages to store so that the packages they # depend on are also added storeContents = [ pseudofiles diff --git a/modules/s6-rc.nix b/modules/s6-rc.nix index 018db5b..5e14ba7 100644 --- a/modules/s6-rc.nix +++ b/modules/s6-rc.nix @@ -4,6 +4,7 @@ let services = builtins.attrValues config.services; }; inherit (pkgs.pseudofile) dir symlink; + inherit (pkgs) s6-init-bin; in { config = { environment = dir { @@ -12,6 +13,9 @@ in { compiled = symlink "${s6-rc-db}/compiled"; }; }; + bin = dir { + init = symlink "${s6-init-bin}/bin/init"; + }; }; }; }