]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-50-dissect: check mount destination instead of mount source
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sun, 11 Sep 2022 15:37:01 +0000 (00:37 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 17 Sep 2022 12:36:18 +0000 (21:36 +0900)
And rebreak long lines.

This should take no effective change, just refactoring.

test/units/testsuite-50.sh

index db39149eb2762317a7445b26051925992f659da3..f8a447d1d9b5d32c167eccc381c970da1d979611 100755 (executable)
@@ -297,7 +297,14 @@ Type=notify
 RemainAfterExit=yes
 MountAPIVFS=yes
 PrivateTmp=yes
-ExecStart=/bin/sh -c 'systemd-notify --ready; while ! grep -q -F MARKER /tmp/img/usr/lib/os-release; do sleep 0.1; done; mount | grep -e "/dev/mapper/${roothash}-verity" -e "/dev/mapper/loop[0-9]*-verity" | grep -q -F "nosuid"'
+ExecStart=/bin/sh -c ' \\
+    systemd-notify --ready; \\
+    while [[ ! -f /tmp/img/usr/lib/os-release ]] || ! grep -q -F MARKER /tmp/img/usr/lib/os-release; do \\
+        sleep 0.1; \\
+    done; \\
+    mount; \\
+    mount | grep -F "on /tmp/img type squashfs" | grep -q -F "nosuid"; \\
+'
 EOF
 systemctl start testservice-50d.service