From 35e288939effa89aba381cebe116b1328ebee1e6 Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Sat, 13 Apr 2019 21:46:39 +0000
Subject: [PATCH] package config files

---
 .../package-lists/common.list.chroot.j2       |  2 +-
 .../package-lists/custom.list.chroot.j2       |  2 +-
 .../package-lists/desktop.list.chroot.j2      |  2 +-
 vars/main.yml                                 | 47 +++++++------------
 4 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/templates/config/package-lists/common.list.chroot.j2 b/templates/config/package-lists/common.list.chroot.j2
index fe3391f..b7a1eb1 100644
--- a/templates/config/package-lists/common.list.chroot.j2
+++ b/templates/config/package-lists/common.list.chroot.j2
@@ -1,3 +1,3 @@
-{% for package in live_build_common_packages %}
+{% 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
index 44a77ff..1b2238c 100644
--- a/templates/config/package-lists/custom.list.chroot.j2
+++ b/templates/config/package-lists/custom.list.chroot.j2
@@ -1,3 +1,3 @@
-{% for package in live_build_custom_packages %}
+{% 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
index 3ffd921..2c99860 100644
--- a/templates/config/package-lists/desktop.list.chroot.j2
+++ b/templates/config/package-lists/desktop.list.chroot.j2
@@ -1,3 +1,3 @@
-{% for package in live_build_desktop_packages %}
+{% for package in live_build_desktop_packages | unique %}
 {{ package }}
 {% endfor %}
diff --git a/vars/main.yml b/vars/main.yml
index a718c6f..ac558f2 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -6,6 +6,22 @@ live_build_common_packages:
   # shells
   - fish
 
+  # admin tools
+  - tmux
+  - rsync
+  - lsof
+  - vim
+  - pv
+  - less
+
+  # network tools
+  - iputils-ping
+  - whois
+  - nmap
+  - tcpdump
+  - dnsutils
+  - resolvconf
+
   # hardware utils
   - pciutils
   - usbutils
@@ -25,37 +41,6 @@ live_build_common_packages:
   # installation utils
   - debootstrap
 
-  # admin tools
-  - tmux
-  - rsync
-  - lsof
-  - vim
-  - pv
-  - less
-
-  # network tools
-  - iputils-ping
-  - whois
-  - nmap
-  - tcpdump
-  - dnsutils
-
-  # admin tools
-  - tmux
-  - rsync
-  - lsof
-  - vim
-  - pv
-  - less
-
-  # network tools
-  - iputils-ping
-  - whois
-  - nmap
-  - tcpdump
-  - dnsutils
-  - resolvconf
-
 live_build_desktop_packages:
   - xfce4
   - i3