diff options
Diffstat (limited to 'test/units/testsuite-14.sh')
| -rwxr-xr-x | test/units/testsuite-14.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/units/testsuite-14.sh b/test/units/testsuite-14.sh index 95ac9b65ae..7a64d93736 100755 --- a/test/units/testsuite-14.sh +++ b/test/units/testsuite-14.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -e -set -x +set -eux +set -o pipefail function setup_root { local _root="$1" @@ -21,18 +21,18 @@ r="$(pwd)/overwrite-broken-machine-id" setup_root "$r" systemd-machine-id-setup --print --root "$r" echo abc >>"$r/etc/machine-id" -id=$(systemd-machine-id-setup --print --root "$r") -echo $id >expected +id="$(systemd-machine-id-setup --print --root "$r")" +echo "$id" >expected check expected "$r/etc/machine-id" -r="$(pwd)/transient-machine-id" +r="$PWD/transient-machine-id" setup_root "$r" systemd-machine-id-setup --print --root "$r" echo abc >>"$r/etc/machine-id" mount -o remount,ro "$r" mount -t tmpfs tmpfs "$r/run" -transient_id=$(systemd-machine-id-setup --print --root "$r") +transient_id="$(systemd-machine-id-setup --print --root "$r")" mount -o remount,rw "$r" -commited_id=$(systemd-machine-id-setup --print --commit --root "$r") +commited_id="$(systemd-machine-id-setup --print --commit --root "$r")" [[ "$transient_id" = "$commited_id" ]] check "$r/etc/machine-id" "$r/run/machine-id" |