X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fnodm.mk;h=3a359010f09d6081d16e2fff24ac57dd1e07e2fc;hb=227bf7e16154dfc27187bd69595bfb24d5f8d16f;hp=17b3556be7e4c6c0e822e106971bff7d184f2250;hpb=4a83f36e36d09bfca93a9f3b2cb55e08d5d13169;p=blast

diff --git a/modules/nodm.mk b/modules/nodm.mk
index 17b3556..3a35901 100644
--- a/modules/nodm.mk
+++ b/modules/nodm.mk
@@ -1,26 +1,42 @@
 ifdef raspi
-PACKAGES := ${PACKAGES} nodm xserver-xorg-video-fbturbo xserver-xorg-input-evdev
+  PACKAGES += nodm xserver-xorg-input-evdev libgl1-mesa-dri
 else
-PACKAGES := ${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 +=
 
-define DEBCONF :=
-${DEBCONF}
 nodm	nodm/enabled	boolean	true
 endef
 
 ifdef nodm_user
-_config: _nodm_user
-define DEBCONF :=
-${DEBCONF}
+  _config: _nodm_user _nodm_cfg
+define DEBCONF +=
+
 nodm	nodm/user	string	${nodm_user}
 endef
+endif
+
+ifdef webui
+  _config: _nodm_cfg
+  ifdef raspi
+    PACKAGES += chromium-browser
+  else
+    PACKAGES += chromium
+  endif
+define DEBCONF +=
 
+nodm	nodm/xsession	string	/usr/bin/chromium --app=${webui}
+endef
 endif
 
-.PHONY: _nodm_user
-_nodm_user: ${CFGROOT}
+.PHONY: _nodm_user _nodm_cfg
+
+_nodm_cfg: ${CFGROOT}
 	rm "$${CFGROOT}/etc/default/nodm"
-	chroot "${CFGROOT}" dpkg-reconfigure --default-priority -u nodm
+	chroot "$${CFGROOT}" dpkg-reconfigure --default-priority -u nodm
+
+_nodm_user: ${CFGROOT}
 	chroot "${CFGROOT}" adduser "${nodm_user}" video
+	chroot "${CFGROOT}" adduser "${nodm_user}" input
+