From 9b2d4952fe22bed8dc2d585e516157e968113951 Mon Sep 17 00:00:00 2001 From: Lukas Funke Date: Wed, 8 Nov 2023 10:40:59 +0100 Subject: udev-extraconf: mount.sh: check if filesystem is supported before mounting Check if the filesystem is supported by the kernel before trying to mount it. Systemd-mount will mount the directories asynchronously resulting in stale directories if the devices filesystem is not supported. (From OE-Core rev: 695e0a41e3c1cb47484605934a57e7df591bd19f) Signed-off-by: Lukas Funke Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-core/udev/udev-extraconf/mount.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'meta/recipes-core/udev/udev-extraconf') diff --git a/meta/recipes-core/udev/udev-extraconf/mount.sh b/meta/recipes-core/udev/udev-extraconf/mount.sh index b7e86dbc0e..0cd51fcde8 100644 --- a/meta/recipes-core/udev/udev-extraconf/mount.sh +++ b/meta/recipes-core/udev/udev-extraconf/mount.sh @@ -36,6 +36,16 @@ do fi done +is_filesystem_supported() { + while read -r fs; do + if [ "${fs#nodev}" = "$1" ]; + then + return 0 + fi + done < "/proc/filesystems" + return 1 +} + automount_systemd() { name="`basename "$DEVNAME"`" @@ -64,6 +74,11 @@ automount_systemd() { grep "^[[:space:]]*$tmp" /etc/fstab && return done + if ! is_filesystem_supported $ID_FS_TYPE; then + logger "mount.sh/automount" "Filesystem '$ID_FS_TYPE' on '${DEVNAME}' is unsupported" + return + fi + [ -d "$MOUNT_BASE/$name" ] || mkdir -p "$MOUNT_BASE/$name" MOUNT="$MOUNT -o silent" -- cgit v1.2.3-54-g00ecf