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

diff --git a/modules/nodm.mk b/modules/nodm.mk
index 17b3556..f871f43 100644
--- a/modules/nodm.mk
+++ b/modules/nodm.mk
@@ -1,26 +1,39 @@
 ifdef raspi
-PACKAGES := ${PACKAGES} nodm xserver-xorg-video-fbturbo xserver-xorg-input-evdev
+  PACKAGES += nodm xserver-xorg-video-fbturbo xserver-xorg-input-evdev
 else
-PACKAGES := ${PACKAGES} nodm xserver-xorg-video-all xserver-xorg-input-all
+  PACKAGES += nodm xserver-xorg-video-all xserver-xorg-input-all
 endif
 
-
-define DEBCONF :=
-${DEBCONF}
+define 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}
+	#printf '%s\n' "$${DEBCONF}" |chroot "$${CFGROOT}" debconf-set-selections
 	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