summaryrefslogtreecommitdiff
path: root/test/TEST-02-CRYPTSETUP/test.sh
diff options
context:
space:
mode:
authorEvgeny Vereshchagin <evvers@ya.ru>2015-11-08 22:00:34 +0000
committerEvgeny Vereshchagin <evvers@ya.ru>2015-11-10 18:01:15 +0000
commit5c404f1ab8e96efedb983806443ca982a1b2a372 (patch)
tree4183825be3d59b298243ae1bb513190462f8a514 /test/TEST-02-CRYPTSETUP/test.sh
parent2933d599c242ebfc70ddcffe59163916b02270f1 (diff)
tests: various fixes
* remove journal flushing (systemd-journal-flush.service runs journalctl --flush on boot) * use sh -c and PATH instead of @SYSTEMCTL@ expansion * remove unnecessary semicolons etc
Diffstat (limited to 'test/TEST-02-CRYPTSETUP/test.sh')
-rwxr-xr-xtest/TEST-02-CRYPTSETUP/test.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh
index 4be2365e2f..2997da06ff 100755
--- a/test/TEST-02-CRYPTSETUP/test.sh
+++ b/test/TEST-02-CRYPTSETUP/test.sh
@@ -59,7 +59,7 @@ Description=Testsuite service
After=multi-user.target
[Service]
-ExecStart=/bin/bash -c 'set -x; systemctl --failed --no-legend --no-pager > /failed ; echo OK > /testok; while : ;do systemd-cat echo "testsuite service waiting for /var/log/journal" ; echo "testsuite service waiting for journal to move to /var/log/journal" > /dev/console ; for i in /var/log/journal/*;do [ -d "\$i" ] && echo "\$i" && break 2; done; sleep 1; done; sleep 1; exit 0;'
+ExecStart=/bin/sh -x -c 'systemctl --failed --no-legend --no-pager > /failed ; echo OK > /testok'
Type=oneshot
EOF