Apply patch from V3n3RiX.

https://gitlab.com/redcore/redcore-desktop/raw/master/app-admin/calamares/files/calamares-3.1.1-luks-fstab-write-devmapper.patch Fixes #772
2017-09-04 06:33:01 -04:00 · 2017-09-04 06:33:01 -04:00 · 47dcbefe2c
commit 47dcbefe2c
parent b22bd67a5f
1 changed files with 14 additions and 6 deletions
--- a/src/modules/fstab/main.py
+++ b/src/modules/fstab/main.py
@ -262,6 +262,14 @@ class FstabGenerator(object):
                check=check,
                )

+        if "luksMapperName" in partition:
+            return dict(device="/dev/mapper/" + partition["luksMapperName"],
+                        mount_point=mount_point or "swap",
+                        fs=filesystem,
+                        options=options,
+                        check=check,
+                        )
+        else:
            return dict(device="UUID=" + partition["uuid"],
                        mount_point=mount_point or "swap",
                        fs=filesystem,