X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fnodm.mk;h=6d8d760ccd27cc343b75fa01f58a67ffb346329b;hb=ff1d321004ae9ebf7baf1c56e604959679b28653;hp=584759243276ce846cc4469850919ee22028090b;hpb=703b776e136a8def262095bb7767243c21d7efcd;p=blast

diff --git a/modules/nodm.mk b/modules/nodm.mk
index 5847592..6d8d760 100644
--- a/modules/nodm.mk
+++ b/modules/nodm.mk
@@ -20,19 +20,22 @@ endif
 ifdef webui
   _config: _nodm_cfg
   ifdef raspi
+    nodm_browser := chromium-browser
     PACKAGES += chromium-browser
   else
+    nodm_browser := chromium
     PACKAGES += chromium
   endif
 define DEBCONF +=
 
-nodm	nodm/xsession	string	/usr/bin/chromium --app=${webui}
+nodm	nodm/xsession	string	"/usr/bin/${nodm_browser} --app=${webui}"
 endef
 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