Module: Mesa
Branch: main
Commit: d0ae58f4134bededcab45cf80dc9f194fdc1bdf3
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d0ae58f4134bededcab45cf80dc9f194fdc1bdf3

Author: Juan A. Suarez Romero <[email protected]>
Date:   Wed Dec  6 12:42:37 2023 +0100

ci: do not mount already mounted directories

In some cases we are using an initramfs image that pre-mounts some of
the directories, so let's skip them in the next stage.

Reviewed-by: Eric Engestrom <[email protected]>
Reviewed-by: David Heidelberg <[email protected]>
Signed-off-by: Juan A. Suarez Romero <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26552>

---

 .gitlab-ci/common/init-stage1.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci/common/init-stage1.sh b/.gitlab-ci/common/init-stage1.sh
index 41f1112d43d..92222a5d4c7 100755
--- a/.gitlab-ci/common/init-stage1.sh
+++ b/.gitlab-ci/common/init-stage1.sh
@@ -7,10 +7,10 @@ set -ex
 
 cd /
 
-mount -t proc none /proc
-mount -t sysfs none /sys
+findmnt --mountpoint /proc || mount -t proc none /proc
+findmnt --mountpoint /sys || mount -t sysfs none /sys
 mount -t debugfs none /sys/kernel/debug
-mount -t devtmpfs none /dev || echo possibly already mounted
+findmnt --mountpoint /dev || mount -t devtmpfs none /dev
 mkdir -p /dev/pts
 mount -t devpts devpts /dev/pts
 mkdir /dev/shm

Reply via email to