From 759b4b4a2a9f4b64629d1a42280b9fbc011ff369 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 12 Sep 2022 00:37:01 +0900 Subject: [PATCH] test-50-dissect: check mount destination instead of mount source And rebreak long lines. This should take no effective change, just refactoring. --- test/units/testsuite-50.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh index db39149eb27..f8a447d1d9b 100755 --- a/test/units/testsuite-50.sh +++ b/test/units/testsuite-50.sh @@ -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