From 97f275d5ce49de6ef9d6541ba31a4eeebc90697b Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 7 Sep 2016 13:56:36 +0200
Subject: only update configuration if valid settings are available

---
 hook/chkeymap | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/hook/chkeymap b/hook/chkeymap
index 0fde5ac..d1cdeb9 100644
--- a/hook/chkeymap
+++ b/hook/chkeymap
@@ -8,18 +8,24 @@ run_latehook() {
 		echo -n "Please give keymap to use: "
 		read keymap
 	fi
-	msg ":: Setting keymap for main system to '${keymap}'..."
-	sed -i "/^KEYMAP=/c KEYMAP=${keymap}" "${newroot}/etc/vconsole.conf"
-	sed -i "/XkbLayout/c Option \"XkbLayout\" \"${keymap}\"" "${newroot}/etc/X11/xorg.conf.d/00-keyboard.conf"
+	if [[ -n "${keymap}" ]]; then
+		msg ":: Setting keymap for main system to '${keymap}'..."
+		sed -i "/^KEYMAP=/c KEYMAP=${keymap}" \
+			"${newroot}/etc/vconsole.conf"
+		sed -i "/XkbLayout/c Option \"XkbLayout\" \"${keymap}\"" \
+			"${newroot}/etc/X11/xorg.conf.d/00-keyboard.conf"
+	fi
 
 	if [[ "${timezone}" = "interactive" ]]; then
 		echo
 		echo -n "Please give timezone to use: "
 		read timezone
 	fi
-	if [[ -z "${timezone}" ]] || [[ ! -e "${newroot}/usr/share/zoneinfo/${timezone}" ]]; then
-		timezone="UTC"
+	if [[ -n "${timezone}" ]]; then
+		if [[ ! -e "${newroot}/usr/share/zoneinfo/${timezone}" ]]; then
+			timezone="UTC"
+		fi
+		msg ":: Setting timezone for main system to '${timezone}'..."
+		ln -sf "/usr/share/zoneinfo/${timezone}" "${newroot}/etc/localtime"
 	fi
-	msg ":: Setting timezone for main system to '${timezone}'..."
-	ln -sf "/usr/share/zoneinfo/${timezone}" "${newroot}/etc/localtime"
 }
-- 
cgit v1.2.3-54-g00ecf