From ce62ad65e123d02ed6653f0974033a7d866450a6 Mon Sep 17 00:00:00 2001
From: Markus Brechtel <markus.brechtel+kita-pro@thengo.net>
Date: Mon, 1 Apr 2019 15:33:04 +0200
Subject: [PATCH] some improvements of installer

---
 templates/lb-config-args.j2 |  5 +++--
 templates/preseed.cfg.j2    | 15 ++++-----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/templates/lb-config-args.j2 b/templates/lb-config-args.j2
index 994f061..a68a4e9 100644
--- a/templates/lb-config-args.j2
+++ b/templates/lb-config-args.j2
@@ -15,8 +15,9 @@
 {% 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 live_build_debian_installer is defined %}
+--debian-installer "{{ live_build_debian_installer }}"
+--debian-installer-gui false
 {% if debian_nonfree_firmware %}
 --firmware-binary true
 {% endif %}
diff --git a/templates/preseed.cfg.j2 b/templates/preseed.cfg.j2
index 2eb775d..ce6f7e6 100644
--- a/templates/preseed.cfg.j2
+++ b/templates/preseed.cfg.j2
@@ -14,9 +14,7 @@ d-i keyboard-configuration/toggle select No toggling
 ### Network console
 
 ### Hostname
-{#
-d-i netcfg/hostname string {{inventory_hostname}}
-#}
+{# d-i netcfg/hostname string {{inventory_hostname}} #}
 
 ### Mirror settings
 d-i mirror/country string manual
@@ -25,13 +23,8 @@ d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
 
 ### Account setup
-# Skip creation of a root account (normal user account will be able to
-# use sudo).
 d-i passwd/root-login boolean true
-# Alternatively, to skip creation of a normal user account.
 d-i passwd/make-user boolean false
-
-# Root password
 {% if root_password is defined %}
 d-i passwd/root-password-crypted password {{ root_password }}
 {% endif %}
@@ -53,9 +46,9 @@ d-i partman/mount_style select uuid
 d-i partman/default_filesystem string btrfs
 
 ### Apt setup
-# You can choose to install non-free and contrib software.
-d-i apt-setup/non-free boolean {{ debian_nonfree_firmware }}
-d-i apt-setup/contrib boolean {{ debian_nonfree_firmware }}
+d-i apt-setup/use_mirror boolean true
+d-i apt-setup/non-free boolean {{ debian_nonfree_firmware | default(false) }}
+d-i apt-setup/contrib boolean {{ debian_nonfree_firmware | default(false) }}
 d-i apt-setup/services-select multiselect security,updates
 d-i apt-setup/security_host string security.debian.org