stdexp: Allow extra mounts

garlic/stages/isolate/default.nix

@@ -9,10 +9,16 @@
   nextStage
 , nixPrefix
 , clusterName ? "mn4"
+, extraMounts ? []
 }:
 
 with garlicTools;
+with builtins;
 
+let
+  slashM = map (line: "-m ${line}") extraMounts;
+  extraMountOptions = concatStringsSep "\n" slashM;
+in
 stdenv.mkDerivation {
   name = "isolate";
   preferLocalBuild = true;
@@ -20,7 +26,7 @@ stdenv.mkDerivation {
   src = ./.;
   dontPatchShebangs = true;
   programPath = "/bin/stage1";
-  inherit nixPrefix clusterName nixtools busybox;
+  inherit nixPrefix clusterName nixtools busybox extraMountOptions;
   inherit nextStage;
   program = stageProgram nextStage;
   desc = "#  $out\n" + (if builtins.hasAttr "desc" nextStage then nextStage.desc else "");

garlic/stages/isolate/stage1

@@ -19,6 +19,7 @@ env=(
   $(env | grep ^PMI || true)
   $(env | grep ^GARLIC || true)
   $(env | grep ^USER || true)
+  $(env | grep ^TMPDIR || true)
   HOME="/homeless-shelter"
 )
 
@@ -39,6 +40,7 @@ mounts=(
 	-m /gpfs/projects/bsc15
 	-m /gpfs/scratch/bsc15
 	-m /bin:@nixPrefix@@busybox@/bin
+  @extraMountOptions@
 )
 
 join_flags="${mounts[@]}"

garlic/stdexp.nix

@@ -75,11 +75,17 @@ rec {
       }
     );
 
-    isolate = {nextStage, conf, ...}: stages.isolate {
+    isolate = {nextStage, conf, ...}: stages.isolate (
-      clusterName = machineConf.name;
+      (
-      inherit (conf) nixPrefix;
+        if (conf ? extraMounts) then { inherit (conf) extraMounts; }
-      inherit nextStage;
+        else {}
-    };
+      ) //
+      {
+        clusterName = machineConf.name;
+        inherit (conf) nixPrefix;
+        inherit nextStage;
+      }
+    );
   };
 
   stdPipelineOverride = {overrides ? {}}: