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

Revert "[fstab] work on #797 and #796"

Browse Source 
This reverts commit bfcfcf7ee3.
This commit is contained in:
Philip 2017-09-14 08:11:51 -04:00
parent db4bbde6a1
commit a199da7aac
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,6 @@ FS_MAP = {
"fat16": "vfat", "fat16": "vfat",
"fat32": "vfat", "fat32": "vfat",
"linuxswap": "swap", "linuxswap": "swap",
"linux-swap": "swap",
} }
@ -226,7 +225,7 @@ class FstabGenerator(object):
def generate_fstab_line_info(self, partition): def generate_fstab_line_info(self, partition):
""" Generates information for each fstab entry. """ """ Generates information for each fstab entry. """
filesystem = partition["fs"].lower() filesystem = partition["fs"].lower().strip("-")
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)