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

[fstab] Document the remapping of fs names

Browse Source 
- Shuffle the code a little so it's clear where the remapping
  happens, and explain why we look for "swap" in fstab and
  "linuxswap" elsewhere.
This commit is contained in:
Adriaan de Groot 2020-02-16 21:42:08 +01:00
parent 1b80cf82de
commit f9d9cd2df4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/fstab/main.py
View File

@ -232,14 +232,21 @@ class FstabGenerator(object):
self.print_fstab_line(dct, file=fstab_file) self.print_fstab_line(dct, file=fstab_file)
def generate_fstab_line_info(self, partition): def generate_fstab_line_info(self, partition):
""" Generates information for each fstab entry. """ """
Generates information (a dictionary of fstab-fields)
for the given @p partition.
"""
# Some "fs" names need special handling in /etc/fstab, so remap them.
filesystem = partition["fs"].lower() filesystem = partition["fs"].lower()
filesystem = FS_MAP.get(filesystem, filesystem)
has_luks = "luksMapperName" in partition has_luks = "luksMapperName" in partition
mount_point = partition["mountPoint"] mount_point = partition["mountPoint"]
disk_name = disk_name_for_partition(partition) disk_name = disk_name_for_partition(partition)
is_ssd = disk_name in self.ssd_disks is_ssd = disk_name in self.ssd_disks
filesystem = FS_MAP.get(filesystem, filesystem)
# Swap partitions are called "linuxswap" by parted.
# That "fs" is visible in GS, but that gets mapped
# to "swap", above, because that's the spelling needed in /etc/fstab
if not mount_point and not filesystem == "swap": if not mount_point and not filesystem == "swap":
return None return None
if not mount_point: if not mount_point: