From 2bec50c2de63960e520f59ba51ad59cfc6805a63 Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Wed, 30 Aug 2017 22:17:34 +0000
Subject: [PATCH] current

---
 defaults/main.yml               |  2 ++
 tasks/main.yml                  |  1 -
 templates/custom.list.chroot.j2 |  2 +-
 templates/lb-config-args.j2     | 20 ++++++++++++++++++++
 vars/main.yml                   | 13 ++++++++++++-
 5 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 8058558..a1cf333 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,3 +3,5 @@ debian_mirror: http://deb.debian.org/debian
 debian_live_build_serial_console: false
 debian_live_build_bootappend_live: boot=live components quiet {{ debian_live_build_serial_console | ternary('console=ttyS0','') }} hostname={{ debian_live_build_hostname }}
 debian_live_build_hostname: "{{ inventory_hostname }}"
+
+debian_live_build_distribution: stretch
diff --git a/tasks/main.yml b/tasks/main.yml
index b95c910..449548a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -27,7 +27,6 @@
     lb clean
   args:
     chdir: "{{ debian_live_build_directory }}"
-  when: live_build_clean is defined and live_build_clean
 
 - name: lb config
   command:
diff --git a/templates/custom.list.chroot.j2 b/templates/custom.list.chroot.j2
index 439b8cb..f334167 100644
--- a/templates/custom.list.chroot.j2
+++ b/templates/custom.list.chroot.j2
@@ -1,3 +1,3 @@
 {% for package in debian_live_build_custom_packages %}
-{{package}}
+{{ package }}
 {% endfor %}
diff --git a/templates/lb-config-args.j2 b/templates/lb-config-args.j2
index 12ec36c..e68c123 100644
--- a/templates/lb-config-args.j2
+++ b/templates/lb-config-args.j2
@@ -9,3 +9,23 @@
 {% if debian_live_build_bootappend_live is defined %}
 --bootappend-live "{{ debian_live_build_bootappend_live }}"
 {% endif %}
+{% if debian_live_debian_installer is defined %}
+--debian-installer "{{ debian_live_debian_installer }}"
+{% endif %}
+{% if debian_mirror is defined %}
+--mirror-binary "{{ debian_mirror }}"
+--mirror-binary-updates "{{ debian_mirror }}"
+{% if (debian_backports is defined) and (debian_backports == true)  %}
+--mirror-binary-backports "{{ debian_mirror }}"
+{% endif %}
+--mirror-debian-installer "{{ debian_mirror }}"
+{% endif %}
+{% if debian_security_mirror is defined %}
+--mirror-binary-security "{{ debian_security_mirror }}"
+{% endif %}
+{% if (debian_backports is defined) and (debian_backports == true)  %}
+--backports true
+{% endif %}
+{% if debian_components is defined %}
+--archive-areas {% debian_components | join(",") %}
+{% endif %}
diff --git a/vars/main.yml b/vars/main.yml
index 6ba9744..4cfe32b 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,12 +1,23 @@
 debian_live_build_common_packages:
   - openssh-server
   - python
+  - console-setup
 
   # hardware utils
   - pciutils
   - usbutils
   - acpi
 
+  # hard disk utils
+  - btrfs-tools
+  - parted
+  - mdadm
+  - cryptsetup
+  - lvm2
+
+  # installation utils
+  - debootstrap
+
   # admin tools
   - tmux
   - rsync
@@ -20,8 +31,8 @@ debian_live_build_common_packages:
   - whois
   - nmap
   - tcpdump
-
   - dnsutils
+
   # admin tools
   - tmux
   - rsync