Merge branch 'master' into raspi-elok

[blast] / modules / nodm.mk

diff --git a/modules/nodm.mk b/modules/nodm.mk
index 2d3b6ee12c4f46693939f346ba86c782ed3fc9d1..6d8d760ccd27cc343b75fa01f58a67ffb346329b 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 's;^TimeoutStopSec=.*$$;TimeoutStopSec=1;' "$${CFGROOT}/lib/systemd/system/nodm.service"
        rm "$${CFGROOT}/etc/default/nodm"
        chroot "$${CFGROOT}" dpkg-reconfigure --default-priority -u nodm