From 6e9ce7194f47abd8c27cb61cdad5a0b828ea174d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Fri, 6 Nov 2020 05:56:29 -0500 Subject: [PATCH] [mount] Ignore unformatted filesystems only Mount guesses the filesystem if it is unset or if it is set to auto, thanks to blkid. That is the case for the bind mountpoints like /dev or /run/udev in mount.conf. See `mount(8)` for more details. --- src/modules/mount/main.py | 2 +- src/modules/mount/mount.conf | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 71599a6de..1313fca49 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -56,7 +56,7 @@ def mount_partition(root_mount_point, partition, partitions): raise fstype = partition.get("fs", "").lower() - if not fstype or fstype == "unformatted": + if fstype == "unformatted": return if fstype == "fat16" or fstype == "fat32": diff --git a/src/modules/mount/mount.conf b/src/modules/mount/mount.conf index 1e70465c2..3a117d32c 100644 --- a/src/modules/mount/mount.conf +++ b/src/modules/mount/mount.conf @@ -12,10 +12,13 @@ # Extra filesystems to mount. The key's value is a list of entries; each # entry has four keys: # - device The device node to mount -# - fs The filesystem type to use +# - fs (optional) The filesystem type to use # - mountPoint Where to mount the filesystem # - options (optional) Extra options to pass to mount(8) # +# The device is not mounted if the mountPoint is unset or if the fs is +# set to unformatted. +# extraMounts: - device: proc fs: proc