From e084d3d3e56f6ff8a95a46e237bdf89bb954a7e5 Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Fri, 4 Feb 2022 11:32:55 +0100
Subject: [PATCH 1/3] machine packages for container installation

---
 defaults/main.yaml         |  3 +++
 tasks/debian_packages.yaml |  5 +++++
 tasks/network.yaml         | 19 +++++++++++++------
 vars/main.yaml             |  4 +---
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/defaults/main.yaml b/defaults/main.yaml
index af670e0..836fa04 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -30,6 +30,9 @@ debian_backports_sources: "{{debian_sources}}"
 debian_security_sources: "{{debian_sources}}"
 
 common_package_intallation: true
+machine_package_intallation: true
 microcode_update: false
 
 increase_maximum_inotify_user_watches: true
+
+resolvconf_enabled: true
diff --git a/tasks/debian_packages.yaml b/tasks/debian_packages.yaml
index 3a327be..f407803 100644
--- a/tasks/debian_packages.yaml
+++ b/tasks/debian_packages.yaml
@@ -9,6 +9,11 @@
     pkg: "{{ debian_boot_packages }}"
   when: debian_boot_packages is defined
 
+- name: debian machine packages
+  apt:
+    pkg: "{{ debian_machine_packages }}"
+  when: machine_package_intallation
+
 - name: debian common packages
   apt:
     pkg: "{{ debian_common_packages }}"
diff --git a/tasks/network.yaml b/tasks/network.yaml
index 7026391..167e302 100644
--- a/tasks/network.yaml
+++ b/tasks/network.yaml
@@ -1,8 +1,15 @@
 ---
 
-- name: link resolv.conf
-  file:
-    src: /run/resolvconf/resolv.conf
-    dest: /etc/resolv.conf
-    state: link
-    force: true
+- when: resolvconf_enabled
+  block:
+
+  - name: resolvconf debian package
+    apt:
+      pkg: resolvconf
+
+  - name: link resolv.conf
+    file:
+      src: /run/resolvconf/resolv.conf
+      dest: /etc/resolv.conf
+      state: link
+      force: true
diff --git a/vars/main.yaml b/vars/main.yaml
index 2492174..a226758 100644
--- a/vars/main.yaml
+++ b/vars/main.yaml
@@ -13,8 +13,6 @@ debian_base_packages:
   # network tools
   - iputils-ping
 
-  # network config
-  - resolvconf
 
   # compression
   - unzip
@@ -110,7 +108,7 @@ debian_common_packages:
   # installation utils
   - debootstrap
 
-debian_hardware_packages:
+debian_machine_packages:
 
   # hardware utils
   - pciutils

From 71921a328f7533c0837e2730b40fae41def9e28f Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Fri, 4 Feb 2022 17:08:47 +0100
Subject: [PATCH 2/3] do not increase inotify watches per default

---
 defaults/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/main.yaml b/defaults/main.yaml
index 836fa04..5e75e22 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -33,6 +33,6 @@ common_package_intallation: true
 machine_package_intallation: true
 microcode_update: false
 
-increase_maximum_inotify_user_watches: true
+increase_maximum_inotify_user_watches: false
 
 resolvconf_enabled: true

From d7bc32579c4be6de2df4b747c9b82b68e529764b Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Fri, 4 Feb 2022 21:59:38 +0100
Subject: [PATCH 3/3] net-tools

---
 vars/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vars/main.yaml b/vars/main.yaml
index a226758..be2a162 100644
--- a/vars/main.yaml
+++ b/vars/main.yaml
@@ -11,9 +11,9 @@ debian_base_packages:
   - nano
 
   # network tools
+  - net-tools
   - iputils-ping
 
-
   # compression
   - unzip
   - p7zip