From d68ea8a85d0ef3f7aaaf9ce2bf7bc7da5480e449 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 1 Jan 2017 23:03:24 +0100
Subject: DLACK: create a default config for localectl.

---
 liveinit               | 2 ++
 make_slackware_live.sh | 1 +
 2 files changed, 3 insertions(+)

diff --git a/liveinit b/liveinit
index 38a13b1..bb2e070 100755
--- a/liveinit
+++ b/liveinit
@@ -814,6 +814,7 @@ if [ -x /usr/bin/loadkeys ]; then
 fi
 EOT
     chmod 755 /mnt/overlay/etc/rc.d/rc.keymap
+    echo "KEYMAP=${KEYMAP}" > /mnt/overlay/etc/vconsole.conf
   fi
   if [ ! -z "$KEYMAP" -o ! -z "$XKB" ]; then
     # Set a keyboard mapping in X.Org, derived from the console map if needed:
@@ -890,6 +891,7 @@ EOT
     # Configure custom locale:
     echo "${MARKER}:  Switching to '$LOCALE' locale"
     sed -i -e "s/^ *export LANG=.*/export LANG=${LOCALE}/" /mnt/overlay/etc/profile.d/lang.sh
+    echo "LANG=${LOCALE}" > /mnt/overlay/etc/locale.conf
   fi
 
   if [ ! -z "$TZ" -a -f /mnt/overlay/usr/share/zoneinfo/${TZ} ]; then
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 998cd4d..62e8cf5 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -1129,6 +1129,7 @@ if grep -q "^ *export LANG=" ${LIVE_ROOTDIR}/etc/profile.d/lang.sh ; then
 else
   echo "export LANG=en_US.UTF-8" >> ${LIVE_ROOTDIR}/etc/profile.d/lang.sh
 fi
+echo "LANG=en_US.UTF-8" > ${LIVE_ROOTDIR}/etc/locale.conf
 
 # Set timezone to UTC:
 cp -a ${LIVE_ROOTDIR}/usr/share/zoneinfo/UTC ${LIVE_ROOTDIR}/etc/localtime
-- 
cgit v1.2.3