Make cacheDir configurable in profile build function, minor tweaks

nixproc/create-managed-process/bsdrc/build-bsdrc-env.nix

@@ -3,6 +3,7 @@
 , stateDir ? "/var"
 , runtimeDir ? "${stateDir}/run"
 , logDir ? "${stateDir}/log"
+, cacheDir ? "${cacheDir}/cache"
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , exprFile ? null

nixproc/create-managed-process/cygrunsrv/build-cygrunsrv-env.nix

@@ -3,6 +3,7 @@
 , stateDir ? "/var"
 , runtimeDir ? "${stateDir}/run"
 , logDir ? "${stateDir}/log"
+, cacheDir ? "${cacheDir}/cache"
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , extraParams ? {}

nixproc/create-managed-process/disnix/build-disnix-env.nix

@@ -3,6 +3,7 @@
 , stateDir ? "/var"
 , runtimeDir ? "${stateDir}/run"
 , logDir ? "${stateDir}/log"
+, cacheDir ? "${cacheDir}/cache"
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , clientInterface ? (if builtins.getEnv "DISNIX_CLIENT_INTERFACE" == "" then "disnix-run-activity" else builtins.getEnv "DISNIX_CLIENT_INTERFACE")

nixproc/create-managed-process/docker/build-docker-env.nix

@@ -3,6 +3,7 @@
 , stateDir ? "/var"
 , runtimeDir ? "${stateDir}/run"
 , logDir ? "${stateDir}/log"
+, cacheDir ? "${stateDir}/cache"
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , extraParams ? {}

nixproc/create-managed-process/launchd/build-launchd-env.nix

@@ -3,6 +3,7 @@
 , stateDir ? "/var"
 , runtimeDir ? "${stateDir}/run"
 , logDir ? "${stateDir}/log"
+, cacheDir ? "${cacheDir}/cache"
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , extraParams ? {}

nixproc/create-managed-process/supervisord/build-supervisord-env.nix

@@ -3,6 +3,7 @@
 , stateDir ? "/var"
 , runtimeDir ? "${stateDir}/run"
 , logDir ? "${stateDir}/log"
+, cacheDir ? "${stateDir}/cache"
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , extraParams ? {}

nixproc/create-managed-process/systemd/build-systemd-env.nix

@@ -3,6 +3,7 @@
 , stateDir ? "/var"
 , runtimeDir ? "${stateDir}/run"
 , logDir ? "${stateDir}/log"
+, cacheDir ? "${stateDir}/cache"
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , extraParams ? {}

nixproc/create-managed-process/sysvinit/build-sysvinit-env.nix

@@ -3,6 +3,7 @@
 , stateDir ? "/var"
 , runtimeDir ? "${stateDir}/run"
 , logDir ? "${stateDir}/log"
+, cacheDir ? "${stateDir}/cache"
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , extraParams ? {}

nixproc/create-managed-process/sysvinit/create-sysvinit-script.nix

@@ -147,7 +147,10 @@ let
               inherit process args pidFilesDir;
             };
         in
-        initialize + invocationCommand;
+        ''
+          ${initialize}
+          ${invocationCommand}
+        '';
     };
     stop = {
       activity = "Stopping";

tools/bsdrc/nixproc-bsdrc-runactivity.in

@@ -75,7 +75,12 @@ composeOldProfilePath
 
 # Execute the activities
 
-rcpath="$oldProfilePath/etc/rc.d"
+if [ "$2" = "" ]
+then
+    rcpath="$oldProfilePath/etc/rc.d"
+else
+    rcpath="$2/etc/rc.d"
+fi
 
 if [ "$reverse" = "1" ]
 then

tools/sysvinit/nixproc-sysvinit-runactivity.in

@@ -86,7 +86,7 @@ if [ "$2" = "" ]
 then
     rcpath="$oldProfilePath/etc/rc.d/rc${runlevel}.d"
 else
-    rcpath="$2"
+    rcpath="$2/etc/rc.d/rc${runlevel}.d"
 fi
 
 # Execute the activities

tools/sysvinit/sysvinitchecks

@@ -4,7 +4,7 @@ checkRunlevel()
 {
     if [ "$runlevel" = "" ]
     then
-        if command -v runlevel 2> /dev/null
+        if command -v runlevel > /dev/null
         then
             runlevel=$(runlevel | cut -d ' ' -f2)