merge changes from master regarding keyboard settings and nodm

diff --git a/config.example b/config.example
index 33064de9736f2e64d27a259ba6a1396f8595ffcd..5aee80440888c9c1659042273e066b45d6c6a592 100644 (file)
--- a/config.example
+++ b/config.example
@@ -42,6 +42,10 @@
 ## Comma separated list of locales, first one will become default locale
 # locales=de_DE.UTF-8,en_US.UTF-8
 
+## Keyboard as used in debconfs keyboard-configuration/variant
+## Use debconf-get-selections to find out the exact string
+# keyboard=German
+
 ## If nodm is installed, you can choose a user to login automatically
 ## If no user is given here, then nodm will default to root
 # nodm_user=adam

diff --git a/modules/default.mk b/modules/default.mk
index 6282070a5f4cb19fe95687fab62988204884ee77..0dfe4505208411c22ba08eeb1595143fe39ae249 100644 (file)
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -10,11 +10,15 @@ 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  English (US) - English (Macintosh)
+keyboard-configuration keyboard-configuration/variant  select  ${keyboard}
 endef
 
 define RPICONFIG :=
@@ -23,11 +27,16 @@ ${RPICONFIG}
 dtoverlay=vc4-fkms-v3d,cma-256
 endef
 
-.PHONY: _debconf_selections _raspberry_config
+.PHONY: _debconf_selections _raspberry_config _keyboard
 _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 raspi
   _config: _raspberry_config
 endif

diff --git a/modules/nodm.mk b/modules/nodm.mk
index 2d3b6ee12c4f46693939f346ba86c782ed3fc9d1..a2d36622a5fb3f01fda84e497aa540133ae52cb9 100644 (file)
--- a/modules/nodm.mk
+++ b/modules/nodm.mk
@@ -35,6 +35,7 @@ endif
 .PHONY: _nodm_user _nodm_cfg
 
 _nodm_cfg: ${CFGROOT}
+       sed -Ei 'TimeoutStopSec=2' "$${CFGROOT}/lib/systemd/system/nodm.service"
        rm "$${CFGROOT}/etc/default/nodm"
        chroot "$${CFGROOT}" dpkg-reconfigure --default-priority -u nodm