From e6bd46a62ce2c07f9f4ea54ce46c38c7239967e6 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Mon, 17 Oct 2022 14:38:00 +0200 Subject: [PATCH] test: drop one layer of escaping --- test/units/testsuite-34.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/units/testsuite-34.sh b/test/units/testsuite-34.sh index beaf3ba31e..2172f7434b 100755 --- a/test/units/testsuite-34.sh +++ b/test/units/testsuite-34.sh @@ -116,7 +116,7 @@ test_check_writable() { rm -rf "/var/lib/$i" "/var/lib/private/$i" done - cat >/run/systemd/system/testservice-34-check-writable.service </run/systemd/system/testservice-34-check-writable.service <<\EOF [Unit] Description=Check writable directories when DynamicUser= with StateDirectory= @@ -133,18 +133,18 @@ ExecStart=bash -c ' \ set -eux; \ set -o pipefail; \ declare -a writable_dirs; \ - readarray -t writable_dirs < <(find / \\( -path /var/tmp -o -path /tmp -o -path /proc -o -path /dev/mqueue -o -path /dev/shm -o \ - -path /sys/fs/bpf -o -path /dev/.lxc -o -path /sys/devices/system/cpu \\) \ + readarray -t writable_dirs < <(find / \( -path /var/tmp -o -path /tmp -o -path /proc -o -path /dev/mqueue -o -path /dev/shm -o \ + -path /sys/fs/bpf -o -path /dev/.lxc -o -path /sys/devices/system/cpu \) \ -prune -o -type d -writable -print 2>/dev/null | sort -u); \ - [[ "\$\${#writable_dirs[@]}" == "8" ]]; \ - [[ "\$\${writable_dirs[0]}" == "/var/lib/private/aaa" ]]; \ - [[ "\$\${writable_dirs[1]}" == "/var/lib/private/aaa/bbb" ]]; \ - [[ "\$\${writable_dirs[2]}" == "/var/lib/private/aaa/ccc" ]]; \ - [[ "\$\${writable_dirs[3]}" == "/var/lib/private/quux/pief" ]]; \ - [[ "\$\${writable_dirs[4]}" == "/var/lib/private/waldo" ]]; \ - [[ "\$\${writable_dirs[5]}" == "/var/lib/private/xxx" ]]; \ - [[ "\$\${writable_dirs[6]}" == "/var/lib/private/xxx/yyy" ]]; \ - [[ "\$\${writable_dirs[7]}" == "/var/lib/private/xxx/zzz" ]]; \ + [[ "$${#writable_dirs[@]}" == "8" ]]; \ + [[ "$${writable_dirs[0]}" == "/var/lib/private/aaa" ]]; \ + [[ "$${writable_dirs[1]}" == "/var/lib/private/aaa/bbb" ]]; \ + [[ "$${writable_dirs[2]}" == "/var/lib/private/aaa/ccc" ]]; \ + [[ "$${writable_dirs[3]}" == "/var/lib/private/quux/pief" ]]; \ + [[ "$${writable_dirs[4]}" == "/var/lib/private/waldo" ]]; \ + [[ "$${writable_dirs[5]}" == "/var/lib/private/xxx" ]]; \ + [[ "$${writable_dirs[6]}" == "/var/lib/private/xxx/yyy" ]]; \ + [[ "$${writable_dirs[7]}" == "/var/lib/private/xxx/zzz" ]]; \ ' EOF systemctl daemon-reload