From 984a1961ee8d18dd210181b64f2151798c616df7 Mon Sep 17 00:00:00 2001
From: Furkan Mustafa <furkan@s2n.io>
Date: Sun, 27 Aug 2017 03:39:43 +0900
Subject: [PATCH 1/2] installer: reset fmt variable on each iteration of loop

---
 installer.sh.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/installer.sh.in b/installer.sh.in
index 1399155..90feade 100644
--- a/installer.sh.in
+++ b/installer.sh.in
@@ -945,6 +945,7 @@ validate_filesystems() {
     mnts=$(grep -E '^MOUNTPOINT.*' $CONF_FILE)
     set -- ${mnts}
     while [ $# -ne 0 ]; do
+        fmt=""
         dev=$2; fstype=$3; size=$4; mntpt="$5"; mkfs=$6
         shift 6
 

From 9901e0883e525ebe8486678b0b85d1096969b6e6 Mon Sep 17 00:00:00 2001
From: Furkan Mustafa <furkan@s2n.io>
Date: Sun, 27 Aug 2017 03:41:50 +0900
Subject: [PATCH 2/2] installer: add support for plain luks volumes

Reason: If user prepares some encrypted partitions on their own,
installer was not showing them as configurable.
---
 installer.sh.in | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/installer.sh.in b/installer.sh.in
index 90feade..8e54a07 100644
--- a/installer.sh.in
+++ b/installer.sh.in
@@ -379,6 +379,18 @@ show_partitions() {
             fi
         done
     done
+    # Device Mapper
+    for p in /dev/mapper/*; do
+        part=$(basename $p)
+        [ "${part}" = "live-rw" ] && continue
+        [ "${part}" = "live-base" ] && continue
+        [ "${part}" = "control" ] && continue
+
+        fstype=$(lsblk -nfr $p|awk '{print $2}'|head -1)
+        fssize=$(lsblk -nr $p|awk '{print $4}'|head -1)
+        echo "${p}"
+        echo "size:${fssize:-unknown};fstype:${fstype:-none}"
+    done
     # Software raid (md)
     for p in $(ls -d /dev/md* 2>/dev/null|grep '[0-9]'); do
         part=$(basename $p)