From e8ed8d284a4f063aaa9c185c6e0bccc47e7ef2d4 Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Fri, 16 Nov 2018 13:17:15 +0000
Subject: [PATCH] config args in tasks

---
 tasks/config.yaml           | 30 +++++++++++++++++++++++++++++-
 templates/lb-config-args.j2 | 23 -----------------------
 2 files changed, 29 insertions(+), 24 deletions(-)
 delete mode 100644 templates/lb-config-args.j2

diff --git a/tasks/config.yaml b/tasks/config.yaml
index 504c39f..9a8f8e6 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -14,7 +14,35 @@
 - name: lb config
   command:
     lb config
-    {{ lookup('template','lb-config-args.j2') }}
+
+    {% if live_build_distribution is defined %}
+    --distribution "{{ live_build_distribution }}"
+    {% endif %}
+
+    --mirror-bootstrap "{{ debian_mirror }}"
+    --mirror-chroot-security "{{ debian_security_mirror }}"
+    --mirror-binary "{{ debian_mirror }}"
+    --mirror-binary-security "{{ debian_security_mirror }}"
+
+    {% if debian_nonfree_firmware %}
+    --archive-areas "main contrib non-free"
+    --firmware-chroot true
+    {% endif %}
+
+    {% if live_build_bootappend_live is defined %}
+    --bootappend-live "{{ live_build_bootappend_live }}"
+    {% endif %}
+
+    {% if (debian_backports is defined) and (debian_backports == true)  %}
+    --backports true
+    {% endif %}
+
+    {% if debian_live_debian_installer is defined %}
+    --debian-installer "{{ debian_live_debian_installer }}"
+    {% if debian_nonfree_firmware %}
+    --firmware-binary true
+    {% endif %}
+    {% endif %}
   args:
     chdir: "{{ live_build_directory }}"
 
diff --git a/templates/lb-config-args.j2 b/templates/lb-config-args.j2
deleted file mode 100644
index 994f061..0000000
--- a/templates/lb-config-args.j2
+++ /dev/null
@@ -1,23 +0,0 @@
-{% if live_build_distribution is defined %}
---distribution "{{ live_build_distribution }}"
-{% endif %}
---mirror-bootstrap "{{ debian_mirror }}"
---mirror-chroot-security "{{ debian_security_mirror }}"
---mirror-binary "{{ debian_mirror }}"
---mirror-binary-security "{{ debian_security_mirror }}"
-{% if debian_nonfree_firmware %}
---archive-areas "main contrib non-free"
---firmware-chroot true
-{% endif %}
-{% if live_build_bootappend_live is defined %}
---bootappend-live "{{ live_build_bootappend_live }}"
-{% endif %}
-{% if (debian_backports is defined) and (debian_backports == true)  %}
---backports true
-{% endif %}
-{% if debian_live_debian_installer is defined %}
---debian-installer "{{ debian_live_debian_installer }}"
-{% if debian_nonfree_firmware %}
---firmware-binary true
-{% endif %}
-{% endif %}