From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 18 May 2023 13:52:43 +0000 (+0200)
Subject: test: don't mount /sys & /proc if already mounted
X-Git-Tag: v254-rc1~447^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d4519dd84878ff1f94ba8f08d4a81350c3b1d08;p=thirdparty%2Fsystemd.git

test: don't mount /sys & /proc if already mounted
---

diff --git a/test/test-functions b/test/test-functions
index bdbc9fdd7c8..f36c38e8f6e 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -884,8 +884,8 @@ INNER_EOF
 # Let's make one to prevent unexpected "<bin> not found" issues in the future
 export PATH="/sbin:/bin:/usr/sbin:/usr/bin"
 
-mount -t proc proc /proc
-mount -t sysfs sysfs /sys
+mountpoint -q /proc || mount -t proc proc /proc
+mountpoint -q /sys || mount -t sysfs sysfs /sys
 mount -o remount,rw /
 
 DEFAULT_ENVIRONMENT="\$DEFAULT_ENVIRONMENT ASAN_RT_PATH=$ASAN_RT_PATH"