From 7108710a074408943ab0b6dfa9c85c5dd2caaa23 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Paul=20H=C3=A4nsch?= <paul@plutz.net>
Date: Thu, 19 Sep 2019 16:00:01 +0200
Subject: [PATCH] fixes from live-image branch

---
 modules/default.mk | 15 ++++++---------
 modules/nodm.mk    |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/modules/default.mk b/modules/default.mk
index 0dfe450..4bacb5c 100644
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -10,15 +10,11 @@ endif
 
 export DEBCONF RPICONFIG
 
-ifndef keyboard
-keyboard := English (US) - English (Macintosh)
-endif
-
 define DEBCONF :=
 ${DEBCONF}
 
 keyboard-configuration	keyboard-configuration/model	select	Generic 105-key (Intl) PC
-keyboard-configuration	keyboard-configuration/variant	select	${keyboard}
+keyboard-configuration	keyboard-configuration/variant	select	English (US) - English (Macintosh)
 endef
 
 define RPICONFIG :=
@@ -32,10 +28,11 @@ _install: _debconf_selections
 _debconf_selections: ${SYSROOT}
 	printf '%s\n' "$${DEBCONF}" |chroot "$${SYSROOT}" debconf-set-selections
 
-_config: _keyboard
-_keyboard: ${CFGROOT} _debconf_selections
-	rm "$${CFGROOT}/etc/default/keyboard"
-	chroot "$${CFGROOT}" dpkg-reconfigure --default-priority -u keyboard-configuration
+ifdef keyboard
+  _config: _keyboard
+endif
+_keyboard: ${CFGROOT}
+	sed -Ei 's;^XKBLAYOUT=.*$$;XKBLAYOUT="${keyboard}";;' "$${CFGROOT}/etc/default/keyboard"
 
 ifdef raspi
   _config: _raspberry_config
diff --git a/modules/nodm.mk b/modules/nodm.mk
index a2d3662..55267ba 100644
--- a/modules/nodm.mk
+++ b/modules/nodm.mk
@@ -35,7 +35,7 @@ endif
 .PHONY: _nodm_user _nodm_cfg
 
 _nodm_cfg: ${CFGROOT}
-	sed -Ei 'TimeoutStopSec=2' "$${CFGROOT}/lib/systemd/system/nodm.service"
+	sed -Ei 's;^TimeoutStopSec=.*$$;TimeoutStopSec=2;' "$${CFGROOT}/lib/systemd/system/nodm.service"
 	rm "$${CFGROOT}/etc/default/nodm"
 	chroot "$${CFGROOT}" dpkg-reconfigure --default-priority -u nodm
 
-- 
2.39.2