From ae6b6fa4e64a2d328a89c73efef99206a9018791 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 16 Mar 2021 20:45:57 +0100
Subject: [PATCH] small fixes

---
 modules/20-installation/post  | 6 +++---
 modules/40-basesystem/install | 5 +----
 modules/40-basesystem/pre     | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/modules/20-installation/post b/modules/20-installation/post
index 735f830..09400ea 100644
--- a/modules/20-installation/post
+++ b/modules/20-installation/post
@@ -4,8 +4,8 @@ ver="$(xbps-query -S linux|grep pkgver|awk '{print $2}')"
 ver="${ver//-}"
 ver="${ver%_*}"
 
-#xbps-reconfigure -f "${ver}"
-#xbps-reconfigure -f glibc-locales
-xbps-reconfigure -af
+xbps-reconfigure -f "${ver}"
+xbps-reconfigure -f glibc-locales
+#xbps-reconfigure -af
 
 module end
diff --git a/modules/40-basesystem/install b/modules/40-basesystem/install
index 8df449a..fd15819 100644
--- a/modules/40-basesystem/install
+++ b/modules/40-basesystem/install
@@ -1,8 +1,5 @@
 module start "basesystem" "Install Basesystem"
 
-source "${var}"
-source "${vars}/disk"
-
 chown root:root /
 chmod 755 /
 
@@ -14,11 +11,11 @@ echo "#ignorepkg=linux-firmware-broadcom";
 echo "#ignorepkg=wifi-firmware"; } > /etc/xbps.d/10-ignore-firmware.conf
 
 { echo "en_DK.UTF-8 UTF-8";
+echo "${cfg[lang]}.UTF-8 UTF-8";
 echo "en_US.UTF-8 UTF-8"; } > /etc/default/libc-locales
 
 echo "LANG=en_US.UTF-8" > /etc/locale.conf
 echo "KEYMAP=${cfg[lang_console]}" > /etc/vconsole.conf
-echo "${cfg[lang]}.UTF-8 UTF-8" >> /etc/default/libc-locales
 echo "LANG=${cfg[lang]}.UTF-8" > /etc/locale-user.conf
 
 cp -a /etc/profile.d/locale.sh "${dest}"/etc/profile.d/zz-locale-user.sh
diff --git a/modules/40-basesystem/pre b/modules/40-basesystem/pre
index 2bf6c69..291fb58 100644
--- a/modules/40-basesystem/pre
+++ b/modules/40-basesystem/pre
@@ -6,7 +6,7 @@ while input "hostname?" "void"; do
 		break
 	fi
 done
-
+echo IHKJHKJHLKHKHKHKHKHKHLKHKHKHKHIUIZVGUVUVUVOUVOUVOUVUVJHVKJVJKVJKVJVJHVUVUZVUVUVOUZVOUZVOUZVOUVUVKJVJHVKJVKVKJHV
 setconf add "lang" "de_DE"
 setconf add "lang_console" "de-latin1-nodeadkeys"
 setconf add "timezone" "Europe/Berlin"