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

This reverts commit bfcfcf7ee3.
2017-09-14 08:11:51 -04:00 · 2017-09-14 08:11:51 -04:00 · a199da7aac
commit a199da7aac
parent db4bbde6a1
1 changed files with 1 additions and 2 deletions
--- a/src/modules/fstab/main.py
+++ b/src/modules/fstab/main.py
@ -55,7 +55,6 @@ FS_MAP = {
    "fat16": "vfat",
    "fat32": "vfat",
    "linuxswap": "swap",
-    "linux-swap": "swap",
 }


@ -226,7 +225,7 @@ class FstabGenerator(object):

    def generate_fstab_line_info(self, partition):
        """ Generates information for each fstab entry. """
-        filesystem = partition["fs"].lower()
+        filesystem = partition["fs"].lower().strip("-")
        has_luks = "luksMapperName" in partition
        mount_point = partition["mountPoint"]
        disk_name = disk_name_for_partition(partition)