From: Yu Watanabe Date: Sun, 11 Sep 2022 15:37:01 +0000 (+0900) Subject: test-50-dissect: check mount destination instead of mount source X-Git-Tag: v252-rc1~156^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=759b4b4a2a9f4b64629d1a42280b9fbc011ff369;p=thirdparty%2Fsystemd.git test-50-dissect: check mount destination instead of mount source And rebreak long lines. This should take no effective change, just refactoring. --- 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