From 46b83a04d9e4b601b8c14bf9f61809d968c556b1 Mon Sep 17 00:00:00 2001
From: Albert Peschar <albert@peschar.net>
Date: Fri, 11 Aug 2023 16:08:41 +0300
Subject: [PATCH] Use --pipe for systemd-run

Without --pipe stderr and stdout are combined, breaking scripts that use
atticd-atticadm when it generates warnings.
---
 integration-tests/basic/default.nix | 4 ++--
 nixos/atticd.nix                    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/integration-tests/basic/default.nix b/integration-tests/basic/default.nix
index d6b17bc..fbdc66e 100644
--- a/integration-tests/basic/default.nix
+++ b/integration-tests/basic/default.nix
@@ -186,8 +186,8 @@ in {
       server.wait_for_unit('atticd.service')
       client.wait_until_succeeds("curl -sL http://server:8080", timeout=40)
 
-      root_token = server.succeed("${cmd.atticadm} make-token --sub 'e2e-root' --validity '1 month' --push '*' --pull '*' --delete '*' --create-cache '*' --destroy-cache '*' --configure-cache '*' --configure-cache-retention '*'").strip()
-      readonly_token = server.succeed("${cmd.atticadm} make-token --sub 'e2e-root' --validity '1 month' --pull 'test'").strip()
+      root_token = server.succeed("${cmd.atticadm} make-token --sub 'e2e-root' --validity '1 month' --push '*' --pull '*' --delete '*' --create-cache '*' --destroy-cache '*' --configure-cache '*' --configure-cache-retention '*' </dev/null").strip()
+      readonly_token = server.succeed("${cmd.atticadm} make-token --sub 'e2e-root' --validity '1 month' --pull 'test' </dev/null").strip()
 
       client.succeed(f"attic login --set-default root http://server:8080 {root_token}")
       client.succeed(f"attic login readonly http://server:8080 {readonly_token}")
diff --git a/nixos/atticd.nix b/nixos/atticd.nix
index f14141a..7697e94 100644
--- a/nixos/atticd.nix
+++ b/nixos/atticd.nix
@@ -36,6 +36,7 @@ let
   atticadmWrapper = pkgs.writeShellScriptBin "atticd-atticadm" ''
     exec systemd-run \
       --quiet \
+      --pipe \
       --pty \
       --same-dir \
       --wait \