small fixes

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

modules/40-basesystem/install

@@ -1,5 +1,7 @@
 module start "basesystem" "Install Basesystem"
 
+diskid="${cfg[diskid]//-/_}"
+
 chown root:root /
 chmod 755 /
 

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