From: Paul Hänsch <paul@plutz.net>
Date: Sat, 20 Jul 2019 10:28:28 +0000 (+0200)
Subject: keep line breaks in DEBCONF variable
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=34a051307470e9b8efe29525e95832b52891ad4c;p=blast

keep line breaks in DEBCONF variable
---

diff --git a/modules/default.mk b/modules/default.mk
index 2f5364b..3263440 100644
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -11,9 +11,9 @@ endif
 export DEBCONF
 
 define DEBCONF :=
+
 keyboard-configuration	keyboard-configuration/model	select	Generic 105-key (Intl) PC
 keyboard-configuration	keyboard-configuration/variant	select	English (US) - English (Macintosh)
-
 endef
 
 .PHONY: _debconf_selections
diff --git a/modules/nodm.mk b/modules/nodm.mk
index f871f43..b207a65 100644
--- a/modules/nodm.mk
+++ b/modules/nodm.mk
@@ -5,12 +5,14 @@ else
 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
@@ -23,6 +25,7 @@ ifdef webui
     PACKAGES += chromium
   endif
 define DEBCONF +=
+
 nodm	nodm/xsession	string	/usr/bin/chromium --app=${webui}
 endef
 endif
@@ -30,7 +33,6 @@ endif
 .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