From a199da7aac933e659421186aa3a45dda411f67bf Mon Sep 17 00:00:00 2001 From: Philip Date: Thu, 14 Sep 2017 08:11:51 -0400 Subject: [PATCH] Revert "[fstab] work on #797 and #796" This reverts commit bfcfcf7ee39a836a8315512ed0255a0f46a30321. --- src/modules/fstab/main.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index 876a6f30b..5cfb62efb 100644 --- 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)