napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[mount] Ignore unformatted filesystems only

Browse Source 
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.
This commit is contained in:
Gaël PORTAY 2020-11-06 05:56:29 -05:00
parent 822e30c894
commit 6e9ce7194f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/mount/main.py
View File

@ -56,7 +56,7 @@ def mount_partition(root_mount_point, partition, partitions):
raise raise
fstype = partition.get("fs", "").lower() fstype = partition.get("fs", "").lower()
if not fstype or fstype == "unformatted": if fstype == "unformatted":
return return
if fstype == "fat16" or fstype == "fat32": if fstype == "fat16" or fstype == "fat32":

5
src/modules/mount/mount.conf
View File

@ -12,10 +12,13 @@
# Extra filesystems to mount. The key's value is a list of entries; each # Extra filesystems to mount. The key's value is a list of entries; each
# entry has four keys: # entry has four keys:
# - device The device node to mount # - 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 # - mountPoint Where to mount the filesystem
# - options (optional) Extra options to pass to mount(8) # - 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: extraMounts:
- device: proc - device: proc
fs: proc fs: proc