From 4c5eaa0c6bca7412ca013434e83c4fa68eb8ee9a Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 22 Apr 2021 22:54:36 +0200 Subject: [PATCH] Add execline to the PATH of s6-svscan to make finding all chainload executables work --- examples/services-agnostic/constructors/constructors.nix | 2 +- examples/services-agnostic/constructors/s6-svscan/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/services-agnostic/constructors/constructors.nix b/examples/services-agnostic/constructors/constructors.nix index 5420d0c..202370a 100644 --- a/examples/services-agnostic/constructors/constructors.nix +++ b/examples/services-agnostic/constructors/constructors.nix @@ -44,6 +44,6 @@ in s6-svscan = import ./s6-svscan { inherit createManagedProcess runtimeDir; - inherit (pkgs) s6; + inherit (pkgs) s6 execline; }; } diff --git a/examples/services-agnostic/constructors/s6-svscan/default.nix b/examples/services-agnostic/constructors/s6-svscan/default.nix index 711009a..acaf630 100644 --- a/examples/services-agnostic/constructors/s6-svscan/default.nix +++ b/examples/services-agnostic/constructors/s6-svscan/default.nix @@ -1,4 +1,4 @@ -{createManagedProcess, s6, runtimeDir}: +{createManagedProcess, s6, execline, runtimeDir}: { instanceSuffix ? "" , instanceName ? "s6-svscan${instanceSuffix}" @@ -10,7 +10,7 @@ createManagedProcess { inherit instanceName; - path = [ s6 ]; + path = [ s6 execline ]; foregroundProcess = "${s6}/bin/s6-svscan"; args = [ scanDir ]; initialize = ''