Module: Mesa Branch: staging/23.3 Commit: a7e3f3b58cf6750627523e7c65220fc9738e786a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a7e3f3b58cf6750627523e7c65220fc9738e786a
Author: Juan A. Suarez Romero <jasua...@igalia.com> 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 <e...@igalia.com> Reviewed-by: David Heidelberg <david.heidelb...@collabora.com> Signed-off-by: Juan A. Suarez Romero <jasua...@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26552> (cherry picked from commit d0ae58f4134bededcab45cf80dc9f194fdc1bdf3) --- .gitlab-ci/common/init-stage1.sh | 6 +++--- .pick_status.json | 2 +- 2 files changed, 4 insertions(+), 4 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 diff --git a/.pick_status.json b/.pick_status.json index 326a7dd5db6..11afbc62c2f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4234,7 +4234,7 @@ "description": "ci: do not mount already mounted directories", "nominated": false, "nomination_type": 3, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null
