From b1420a791c9dab98e28bdb19573a26db14dfae41 Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Thu, 31 Aug 2017 00:40:32 +0000 Subject: [PATCH] clean up lb-config-args.j2 --- templates/lb-config-args.j2 | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/templates/lb-config-args.j2 b/templates/lb-config-args.j2 index eeb989e..32ea12c 100644 --- a/templates/lb-config-args.j2 +++ b/templates/lb-config-args.j2 @@ -1,30 +1,17 @@ {% if live_build_distribution is defined %} --distribution "{{ live_build_distribution }}" {% endif %} -{% if live_build_archive_areas is defined %} ---archive-areas "{{ live_build_archive_areas | join(' ') }}" -{% endif %} --mirror-bootstrap {{ debian_mirror }} --mirror-binary {{ debian_mirror }} {% if live_build_bootappend_live is defined %} --bootappend-live "{{ 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 }}" -{% 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_live_debian_installer is defined %} +--debian-installer "{{ debian_live_debian_installer }}" +{% endif %} {% if (debian_backports is defined) and (debian_backports == true) %} --backports true {% endif %} -{% if debian_components is defined %} ---archive-areas {{ debian_components | join(",") }} -{% endif %}