fixes from live-image branch

diff --git a/modules/default.mk b/modules/default.mk
index 0dfe4505208411c22ba08eeb1595143fe39ae249..4bacb5ca6880fcb586efe774a33d065e811fe386 100644 (file)
--- 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 a2d36622a5fb3f01fda84e497aa540133ae52cb9..55267baff639336946c97f4c02b281c2b8891f12 100644 (file)
--- 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