From 083a91c198fb9561e5c5b420ebe8f0951360f495 Mon Sep 17 00:00:00 2001
From: Chrysostomus <mattitheman@gmail.com>
Date: Wed, 3 Jan 2018 08:26:45 +0200
Subject: [PATCH] add checks to add encryption settings only once

---
 lib/util-base.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/util-base.sh b/lib/util-base.sh
index 6b594d4..350388d 100644
--- a/lib/util-base.sh
+++ b/lib/util-base.sh
@@ -648,20 +648,20 @@ boot_encrypted_setting() {
         #There is no separate /boot parition
         # Check if root is encrypted
         if $(lsblk | grep "/mnt$" | grep -q 'crypt' ); then
-            echo "GRUB_ENABLE_CRYPTODISK=y" >> /mnt/etc/default/grub
+            grep -q "GRUB_ENABLE_CRYPTODISK=y" /mnt/etc/default/grub || echo "GRUB_ENABLE_CRYPTODISK=y" >> /mnt/etc/default/grub
             setup_luks_keyfile
         # Check if root is on encrypted lvm volume
         elif $(lsblk -i | tac | sed -n -e "/$root_name/,/disk/p" | awk '{print $6}' | grep -q crypt); then
-            echo "GRUB_ENABLE_CRYPTODISK=y" >> /mnt/etc/default/grub
+            grep -q "GRUB_ENABLE_CRYPTODISK=y" /mnt/etc/default/grub || echo "GRUB_ENABLE_CRYPTODISK=y" >> /mnt/etc/default/grub
             setup_luks_keyfile
         # Check if root is on encrypted lvm volume
         elif $(lsblk -i | tac | sed -n -e "/$root_name/,/disk/p" | awk '{print $6}' | grep -q crypt); then
-            echo "GRUB_ENABLE_CRYPTODISK=y" >> /mnt/etc/default/grub
+            grep -q "GRUB_ENABLE_CRYPTODISK=y" /mnt/etc/default/grub || echo "GRUB_ENABLE_CRYPTODISK=y" >> /mnt/etc/default/grub
         fi
     else
         # There is a separate /boot. Check if it is encrypted 
         if $(lsblk | grep '/mnt/boot' | grep -q 'crypt' ); then
-            echo "GRUB_ENABLE_CRYPTODISK=y" >> /mnt/etc/default/grub
+            grep -q "GRUB_ENABLE_CRYPTODISK=y" /mnt/etc/default/grub || echo "GRUB_ENABLE_CRYPTODISK=y" >> /mnt/etc/default/grub
             setup_luks_keyfile
         fi
     fi