diff options
| author | Malte Voos <malte@malvo.org> | 2022-05-15 22:46:54 +0200 |
|---|---|---|
| committer | Malte Voos <malte@malvo.org> | 2022-05-15 23:18:51 +0200 |
| commit | ce9ab6951436025dfdf541264fb59f20ce38d806 (patch) | |
| tree | b144fecb3c0ef2cf641c67bb71ff212d0b59d90d | |
| parent | 435b8151120d72ffdc5fbc15ba6e6864d43f6f1a (diff) | |
| download | s6-rc.nix-ce9ab6951436025dfdf541264fb59f20ce38d806.tar.gz s6-rc.nix-ce9ab6951436025dfdf541264fb59f20ce38d806.zip | |
always redirect stderr to stdout for longruns
| -rw-r--r-- | module.nix | 14 |
1 files changed, 7 insertions, 7 deletions
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 |