applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-03 12:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1570 from gportay/mount-skip-if-filesystem-is-unformatted

Browse source 
[mount] Ignore unformatted filesystems only
This commit is contained in:
Adriaan de Groot 2020-11-06 22:25:40 +01:00 • committed by GitHub
commit 009b3b460b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
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