X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fnodm.mk;h=a2d36622a5fb3f01fda84e497aa540133ae52cb9;hb=233cbdea41e71649c40f16eab7a107372b663d31;hp=3a359010f09d6081d16e2fff24ac57dd1e07e2fc;hpb=227bf7e16154dfc27187bd69595bfb24d5f8d16f;p=blast diff --git a/modules/nodm.mk b/modules/nodm.mk index 3a35901..a2d3662 100644 --- a/modules/nodm.mk +++ b/modules/nodm.mk @@ -20,22 +20,29 @@ 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