X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fnodm.mk;h=55267baff639336946c97f4c02b281c2b8891f12;hb=7108710a074408943ab0b6dfa9c85c5dd2caaa23;hp=f871f432995572eb64a01a71bcf9251052fd3c4b;hpb=92dfcb2f828b2bb5eaa5b127ffa1a4bf15432335;p=blast

diff --git a/modules/nodm.mk b/modules/nodm.mk
index f871f43..55267ba 100644
--- a/modules/nodm.mk
+++ b/modules/nodm.mk
@@ -1,16 +1,18 @@
 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 +=
+
 nodm	nodm/enabled	boolean	true
 endef
 
 ifdef nodm_user
   _config: _nodm_user _nodm_cfg
 define DEBCONF +=
+
 nodm	nodm/user	string	${nodm_user}
 endef
 endif
@@ -18,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}
-	#printf '%s\n' "$${DEBCONF}" |chroot "$${CFGROOT}" debconf-set-selections
+	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
 
+ifdef users
+  _nodm_user: _users
+endif
+
 _nodm_user: ${CFGROOT}
 	chroot "${CFGROOT}" adduser "${nodm_user}" video
 	chroot "${CFGROOT}" adduser "${nodm_user}" input
+