From 2f7ac598a32868ba8f6b0efa8495d50b4ab1973f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 4 Sep 2017 06:33:01 -0400 Subject: [PATCH] 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 --- src/modules/fstab/main.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index 9c116b8a0..553eb65ef 100644 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -262,12 +262,20 @@ class FstabGenerator(object): check=check, ) - return dict(device="UUID=" + partition["uuid"], - mount_point=mount_point or "swap", - fs=filesystem, - options=options, - 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, + options=options, + check=check, + ) def print_fstab_line(self, dct, file=None): """ Prints line to '/etc/fstab' file. """