From 429b9f1850cb59a6d3d58d30c710e23eacfe2ae4 Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Fri, 16 Nov 2018 13:08:52 +0000
Subject: [PATCH 1/5] default nonfree firmware

---
 defaults/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/defaults/main.yml b/defaults/main.yml
index 55390b5..55da7f7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -6,3 +6,5 @@ live_build_bootappend_live: boot=live components quiet {{ live_build_serial_cons
 live_build_hostname: "{{ inventory_hostname }}"
 
 live_build_distribution: stretch
+
+debian_nonfree_firmware: true

From a63105d38784d018e77f79ac62df7449e55dd7cb Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Fri, 16 Nov 2018 13:13:25 +0000
Subject: [PATCH 2/5] default build directory

---
 defaults/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/defaults/main.yml b/defaults/main.yml
index 55da7f7..c776cf1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -8,3 +8,5 @@ live_build_hostname: "{{ inventory_hostname }}"
 live_build_distribution: stretch
 
 debian_nonfree_firmware: true
+
+live_build_directory: /opt/live

From 3abb6cd89813f756d46d52cbf3da0c67cbb69bc6 Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Fri, 16 Nov 2018 13:14:14 +0000
Subject: [PATCH 3/5] new apt module format

---
 tasks/setup.yaml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/tasks/setup.yaml b/tasks/setup.yaml
index 3d3d839..6dd2643 100644
--- a/tasks/setup.yaml
+++ b/tasks/setup.yaml
@@ -1,9 +1,7 @@
 ---
-- name: install apt packages
+- name: debian packages
   apt:
-    pkg: "{{ item }}"
-    state: installed
-  with_items:
-    - live-build
-    - memtest86
-    - memtest86+
+    pkg:
+      - live-build
+      - memtest86
+      - memtest86+

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 4/5] 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 %}

From 0757aca4411b7c11d5bafa091a8d362fd665eb38 Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Fri, 16 Nov 2018 15:28:21 +0000
Subject: [PATCH 5/5] debian installer included by default

---
 defaults/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaults/main.yml b/defaults/main.yml
index c776cf1..a0a3a8b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -9,4 +9,5 @@ live_build_distribution: stretch
 
 debian_nonfree_firmware: true
 
+debian_live_debian_installer: live
 live_build_directory: /opt/live