From 619723d51e163d03c93bbdb4da46dc4e0d30a364 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 16 Mar 2021 22:25:12 +0100
Subject: [PATCH] small fixes

---
 modules/10-disk/pre           | 2 +-
 modules/40-basesystem/install | 2 ++
 run_in_chroot.sh              | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/10-disk/pre b/modules/10-disk/pre
index 347b42c..9e03a27 100644
--- a/modules/10-disk/pre
+++ b/modules/10-disk/pre
@@ -164,6 +164,6 @@ setconf "add" "diskid" "${disk[id]}"
 setconf "add" "swapsize" "${swapsize}"
 setconf "add" "rootfssize" "${rootfssize}"
 setconf "add" "wipe" "${cfg[wipe]}"
-setconf "add" "diskname" "${disk[name]}" "nonvolatile"
+setconf "add" "diskname" "${disk[name]}"
 
 module end
diff --git a/modules/40-basesystem/install b/modules/40-basesystem/install
index fd15819..9adfdbb 100644
--- a/modules/40-basesystem/install
+++ b/modules/40-basesystem/install
@@ -1,5 +1,7 @@
 module start "basesystem" "Install Basesystem"
 
+diskid="${cfg[diskid]//-/_}"
+
 chown root:root /
 chmod 755 /
 
diff --git a/run_in_chroot.sh b/run_in_chroot.sh
index 440cb0d..030b293 100755
--- a/run_in_chroot.sh
+++ b/run_in_chroot.sh
@@ -14,6 +14,7 @@ declare -A users=()
 source "${functions}"/functions
 
 for i in $(find "${vars}" -type f); do
+	echo "${i}"
 	source "${i}"
 done