From b80d27e4678b77750289fd70a057c75de1c3624b Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Thu, 23 Apr 2020 17:05:44 +0200
Subject: [PATCH] Export important disk variables

---
 scripts/internal_config.sh | 8 ++++----
 scripts/main_chroot.sh     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/internal_config.sh b/scripts/internal_config.sh
index a6910ff..900cf88 100644
--- a/scripts/internal_config.sh
+++ b/scripts/internal_config.sh
@@ -24,17 +24,17 @@ USED_LUKS=false
 # An array of disk related actions to perform
 DISK_ACTIONS=()
 # An associative array from disk id to a resolvable string
-declare -A DISK_ID_TO_RESOLVABLE
+declare -Ax DISK_ID_TO_RESOLVABLE
 # An associative array from disk id to parent gpt disk id (only for partitions)
-declare -A DISK_ID_PART_TO_GPT_ID
+declare -Ax DISK_ID_PART_TO_GPT_ID
 # An associative array to check for existing ids (maps to uuids)
 declare -A DISK_ID_TO_UUID
 # An associative set to check for correct usage of size=remaining in gpt tables
 declare -A DISK_GPT_HAD_SIZE_REMAINING
 # An associative from PTUUID to device
-declare -A DISK_PTUUID_TO_DEVICE
+declare -Ax DISK_PTUUID_TO_DEVICE
 # An associative from MDADM uuid to device
-declare -A DISK_MDADM_UUID_TO_DEVICE
+declare -Ax DISK_MDADM_UUID_TO_DEVICE
 
 only_one_of() {
 	local previous=""
diff --git a/scripts/main_chroot.sh b/scripts/main_chroot.sh
index 8c6b74d..6549765 100755
--- a/scripts/main_chroot.sh
+++ b/scripts/main_chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -o pipefail
 
-[[ ${EXECUTED_IN_CHROOT} != true ]] \
+[[ $EXECUTED_IN_CHROOT != "true" ]] \
 	&& { echo "This script must not be executed directly!" >&2; exit 1; }
 
 # Source the systems profile