X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fnodm.mk;h=a2d36622a5fb3f01fda84e497aa540133ae52cb9;hb=233cbdea41e71649c40f16eab7a107372b663d31;hp=b207a6549867623aab996fac9e02e7c0cbb02d45;hpb=34a051307470e9b8efe29525e95832b52891ad4c;p=blast

diff --git a/modules/nodm.mk b/modules/nodm.mk
index b207a65..a2d3662 100644
--- a/modules/nodm.mk
+++ b/modules/nodm.mk
@@ -1,7 +1,7 @@
 ifdef raspi
-  PACKAGES += nodm xserver-xorg-video-fbturbo xserver-xorg-input-evdev
+  PACKAGES += nodm xserver-xorg-input-evdev libgl1-mesa-dri
 else
-  PACKAGES += nodm xserver-xorg-video-all xserver-xorg-input-all
+  PACKAGES += nodm xserver-xorg-video-all xserver-xorg-input-all libgl1-mesa-dri
 endif
 
 define DEBCONF +=
@@ -20,22 +20,30 @@ 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 'TimeoutStopSec=2' "$${CFGROOT}/lib/systemd/system/nodm.service"
 	rm "$${CFGROOT}/etc/default/nodm"
 	chroot "$${CFGROOT}" dpkg-reconfigure --default-priority -u nodm
 
+ifdef users
+  _nodm_user: _users
+endif
+
 _nodm_user: ${CFGROOT}
 	chroot "${CFGROOT}" adduser "${nodm_user}" video
 	chroot "${CFGROOT}" adduser "${nodm_user}" input
+