diff --git a/defaults/main.yml b/defaults/main.yml index 55390b5..a0a3a8b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,3 +6,8 @@ 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 + +debian_live_debian_installer: live +live_build_directory: /opt/live diff --git a/tasks/config.yaml b/tasks/config.yaml index 504c39f..2009671 100644 --- a/tasks/config.yaml +++ b/tasks/config.yaml @@ -14,7 +14,36 @@ - 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 }}" + --debian-installer-gui "{{ live_build_debian_installer_gui | default(false) }}" + {% if debian_nonfree_firmware %} + --firmware-binary true + {% endif %} + {% endif %} args: chdir: "{{ live_build_directory }}" 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+ diff --git a/templates/lb-config-args.j2 b/templates/lb-config-args.j2 deleted file mode 100644 index a68a4e9..0000000 --- a/templates/lb-config-args.j2 +++ /dev/null @@ -1,24 +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 live_build_debian_installer is defined %} ---debian-installer "{{ live_build_debian_installer }}" ---debian-installer-gui false -{% if debian_nonfree_firmware %} ---firmware-binary true -{% endif %} -{% endif %}