unified bootloader targets, root key setup, webui mode, modules for live boot (lokfs...

[blast] / modules / nodm.mk

diff --git a/modules/nodm.mk b/modules/nodm.mk
index 17b3556be7e4c6c0e822e106971bff7d184f2250..f871f432995572eb64a01a71bcf9251052fd3c4b 100644 (file)
--- 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