From ce9ab6951436025dfdf541264fb59f20ce38d806 Mon Sep 17 00:00:00 2001
From: Malte Voos <malte@malvo.org>
Date: Sun, 15 May 2022 22:46:54 +0200
Subject: always redirect stderr to stdout for longruns

---
 module.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'module.nix')

diff --git a/module.nix b/module.nix
index c4f9a66..367286b 100644
--- a/module.nix
+++ b/module.nix
@@ -1,11 +1,6 @@
 { config, pkgs, lib, ... }:
 with pkgs.lib;
 let
-  writeExeclineScript = name: text: pkgs.writeScript name ''
-    #!${pkgs.execline}/bin/execlineb -P
-    ${text}
-  '';
-
   # -------- implementation -------- #
 
   cfg = config.s6-rc;
@@ -84,8 +79,13 @@ let
 
   makeLongrunConfig = sv:
     let
-      runScript = writeExeclineScript "run-script" sv.run;
-      finishScript = mapNullable (writeExeclineScript "finish-script") sv.finish;
+      writeLongrunScript = name: text: pkgs.writeScript name ''
+        #!${pkgs.execline}/bin/execlineb -P
+        ${pkgs.execline}/bin/fdmove -c 2 1
+        ${text}
+      '';
+      runScript = writeLongrunScript "run-script" sv.run;
+      finishScript = mapNullable (writeLongrunScript "finish-script") sv.finish;
     in
     makeAtomicConfig sv + ''
       echo longrun > $out/type
-- 
cgit 1.4.1