From b3ffa166e1030ee884fcd667b36278762ab30099 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Fri, 5 Aug 2022 15:57:09 +0200
Subject: [PATCH] new

---
 main.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/main.sh b/main.sh
index 64efac1..894b949 100755
--- a/main.sh
+++ b/main.sh
@@ -172,18 +172,17 @@ do_partition() {
 	done
 	
 	mount "/dev/mapper/vg_${TARGETNAME_UNDERSCORE}-root" "${target}/home" -o subvol=homefs
+	if [ "${ENCRYPTION_STYLE}" == "e" ]; then
+		mkdir -p "${target}/boot" "${target}/var/lib/backup/quelle/bootfs"
+		mount "${BOOTDEV}" "${target}/boot"
+		mkdir -p "${target}/boot/system/snapshots/update" "${target}/boot/system/snapshots/regular" "${target}/boot/system/backup"
+		btrfs subvol create "${target}/boot/bootfs"
+		umount "${target}/boot"
+		mount "${BOOTDEV}" "${target}/boot" -o subvol=bootfs
+	fi
 	if [ "${EFI}" == "1" ]; then
 		mkdir -p "${target}/boot/efi"
 		mount "${TARGET_PHY_ID}-part1" "${target}/boot/efi"
-	else
-		if [ "${ENCRYPTION_STYLE}" == "e" ]; then
-			mkdir -p "${target}/boot" "${target}/var/lib/backup/quelle/bootfs"
-			mount "${BOOTDEV}" "${target}/boot"
-			mkdir -p "${target}/boot/system/snapshots/update" "${target}/boot/system/snapshots/regular" "${target}/boot/system/backup"
-			btrfs subvol create "${target}/boot/bootfs"
-			umount "${target}/boot"
-			mount "${TARGET_PHY_ID}-part1" "${target}/boot" -o subvol=bootfs
-		fi
 	fi