From 997ebc628ee7ad374d689ffc9dfdf29211c10ce0 Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Tue, 18 Jan 2022 22:45:16 +0100
Subject: [PATCH] do not configure packages in this role anymore

---
 defaults/main.yml                             |  5 ++
 tasks/config.yaml                             | 18 ++++---
 .../package-lists/common.list.chroot.j2       |  3 --
 .../package-lists/custom.list.chroot.j2       |  3 --
 .../package-lists/desktop.list.chroot.j2      |  3 --
 vars/main.yml                                 | 50 -------------------
 6 files changed, 17 insertions(+), 65 deletions(-)
 delete mode 100644 templates/config/package-lists/common.list.chroot.j2
 delete mode 100644 templates/config/package-lists/custom.list.chroot.j2
 delete mode 100644 templates/config/package-lists/desktop.list.chroot.j2
 delete mode 100644 vars/main.yml

diff --git a/defaults/main.yml b/defaults/main.yml
index a809c35..2d71e11 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -25,3 +25,8 @@ live_build_iso_publisher: custom
 live_build_nice_level: 14
 
 live_build_linux_surface: false
+
+live_build_common_packages:
+  - openssh-server
+  - python
+  - console-setup
diff --git a/tasks/config.yaml b/tasks/config.yaml
index 5ff4671..7e58814 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -63,19 +63,25 @@
     root_target_directory: "{{ live_build_directory }}/config/includes.chroot/"
 
 - name: include common packages
-  template:
-    src: config/package-lists/common.list.chroot.j2
+  copy: "{{ live_build_common_packages | unique | join('\n') }}"
+    content: config/package-lists/common.list.chroot.j2
     dest: "{{ live_build_directory }}/config/package-lists/common.list.chroot"
 
 - name: include desktop packages
-  template:
-    src: config/package-lists/desktop.list.chroot.j2
+  copy:
+    content: "{{ live_build_desktop_packages | unique | join('\n') }}"
     dest: "{{ live_build_directory }}/config/package-lists/desktop.list.chroot"
   when: live_build_desktop
 
+- name: include debian-installer-launcher package
+  copy:
+    content: debian-installer-launcher
+    dest: "{{ live_build_directory }}/config/package-lists/debian-installer-launcher.list.chroot"
+  when: live_build_desktop
+
 - name: include custom packages
-  template:
-    src: config/package-lists/custom.list.chroot.j2
+  copy:
+    content: "{{ live_build_custom_packages | unique | join('\n') }}"
     dest: "{{ live_build_directory }}/config/package-lists/custom.list.chroot"
   when: live_build_custom_packages is defined
 
diff --git a/templates/config/package-lists/common.list.chroot.j2 b/templates/config/package-lists/common.list.chroot.j2
deleted file mode 100644
index b7a1eb1..0000000
--- a/templates/config/package-lists/common.list.chroot.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for package in live_build_common_packages | unique %}
-{{ package }}
-{% endfor %}
diff --git a/templates/config/package-lists/custom.list.chroot.j2 b/templates/config/package-lists/custom.list.chroot.j2
deleted file mode 100644
index 1b2238c..0000000
--- a/templates/config/package-lists/custom.list.chroot.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for package in live_build_custom_packages | unique %}
-{{ package }}
-{% endfor %}
diff --git a/templates/config/package-lists/desktop.list.chroot.j2 b/templates/config/package-lists/desktop.list.chroot.j2
deleted file mode 100644
index 2c99860..0000000
--- a/templates/config/package-lists/desktop.list.chroot.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for package in live_build_desktop_packages | unique %}
-{{ package }}
-{% endfor %}
diff --git a/vars/main.yml b/vars/main.yml
deleted file mode 100644
index d124399..0000000
--- a/vars/main.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-live_build_common_packages:
-  - openssh-server
-  - python
-  - console-setup
-
-  # shells
-  - fish
-
-  # admin tools
-  - tmux
-  - rsync
-  - lsof
-  - vim
-  - pv
-  - less
-
-  # network tools
-  - iputils-ping
-  - whois
-  - nmap
-  - tcpdump
-  - dnsutils
-  - resolvconf
-
-  # hardware utils
-  - pciutils
-  - usbutils
-  - acpi
-
-  # hard disk utils
-  - parted
-  - mdadm
-  - cryptsetup
-  - lvm2
-
-  # filesystem tools
-  - btrfs-progs
-  - dosfstools
-
-  # installation utils
-  - debootstrap
-
-live_build_desktop_packages:
-  - xfce4
-  - i3
-  - firefox-esr
-  - task-xfce-desktop
-  - task-german
-  - task-german-desktop
-  - debian-installer-launcher