mirror of
https://github.com/zhaofengli/attic.git
synced 2025-03-05 08:17:05 +00:00
Use --pipe for systemd-run
Without --pipe stderr and stdout are combined, breaking scripts that use atticd-atticadm when it generates warnings.
This commit is contained in:
parent
416687e59c
commit
46b83a04d9
2 changed files with 3 additions and 2 deletions
|
@ -186,8 +186,8 @@ in {
|
||||||
server.wait_for_unit('atticd.service')
|
server.wait_for_unit('atticd.service')
|
||||||
client.wait_until_succeeds("curl -sL http://server:8080", timeout=40)
|
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()
|
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'").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 --set-default root http://server:8080 {root_token}")
|
||||||
client.succeed(f"attic login readonly http://server:8080 {readonly_token}")
|
client.succeed(f"attic login readonly http://server:8080 {readonly_token}")
|
||||||
|
|
|
@ -36,6 +36,7 @@ let
|
||||||
atticadmWrapper = pkgs.writeShellScriptBin "atticd-atticadm" ''
|
atticadmWrapper = pkgs.writeShellScriptBin "atticd-atticadm" ''
|
||||||
exec systemd-run \
|
exec systemd-run \
|
||||||
--quiet \
|
--quiet \
|
||||||
|
--pipe \
|
||||||
--pty \
|
--pty \
|
||||||
--same-dir \
|
--same-dir \
|
||||||
--wait \
|
--wait \
|
||||||
|
|
Loading…
Add table
Reference in a new issue