From cc185982ccaa78ad92f3617a6d027d386545912a Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sun, 21 Oct 2018 13:20:41 +0000
Subject: [PATCH 1/3] network-manager: raise dhcpv4 timeout

---
 packer/ansible/roles/network-manager/tasks/main.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packer/ansible/roles/network-manager/tasks/main.yml b/packer/ansible/roles/network-manager/tasks/main.yml
index 5514429..9dfb55e 100644
--- a/packer/ansible/roles/network-manager/tasks/main.yml
+++ b/packer/ansible/roles/network-manager/tasks/main.yml
@@ -6,5 +6,12 @@
         - network-manager
         - network-manager-gnome
       state: present
+
+  - name: configure network-manager
+    ini_file:
+      path: /etc/NetworkManager/NetworkManager.conf
+      section: connection
+      option: ipv4.dhcp-timeout
+      value: 300
 tags:
   - network-manager
-- 
2.51.2


From 01944e81569cb4c08b4afd92c5ee12b586614fb5 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sun, 21 Oct 2018 14:17:57 +0000
Subject: [PATCH 2/3] fix ansible for network-manager role

---
 packer/ansible/playbook.yml                         | 1 +
 packer/ansible/roles/network-manager/tasks/main.yml | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packer/ansible/playbook.yml b/packer/ansible/playbook.yml
index 3d79463..e9e78a6 100644
--- a/packer/ansible/playbook.yml
+++ b/packer/ansible/playbook.yml
@@ -6,6 +6,7 @@
     - role: superuser
     - role: auth
     - role: labsync
+    - role: network-manager
     - role: windowmanager
     - role: l10n
     - role: inkscape
diff --git a/packer/ansible/roles/network-manager/tasks/main.yml b/packer/ansible/roles/network-manager/tasks/main.yml
index 9dfb55e..5ffa801 100644
--- a/packer/ansible/roles/network-manager/tasks/main.yml
+++ b/packer/ansible/roles/network-manager/tasks/main.yml
@@ -13,5 +13,6 @@
       section: connection
       option: ipv4.dhcp-timeout
       value: 300
-tags:
-  - network-manager
+
+  tags:
+    - network-manager
-- 
2.51.2


From 44fbdd99db6ee620973d518c6641224045c64370 Mon Sep 17 00:00:00 2001
From: jalr <mail@jalr.de>
Date: Sun, 21 Oct 2018 18:25:12 +0200
Subject: [PATCH 3/3] force re-connect after network-manager starts up

---
 .../ansible/roles/network-manager/files/override.conf  |  3 +++
 packer/ansible/roles/network-manager/tasks/main.yml    | 10 ++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 packer/ansible/roles/network-manager/files/override.conf

diff --git a/packer/ansible/roles/network-manager/files/override.conf b/packer/ansible/roles/network-manager/files/override.conf
new file mode 100644
index 0000000..e67bc75
--- /dev/null
+++ b/packer/ansible/roles/network-manager/files/override.conf
@@ -0,0 +1,3 @@
+[Service]
+Environment=LC_ALL=en_US.UTF-8
+ExecStartPost=/usr/bin/nmcli connection up 'Wired connection 1'
diff --git a/packer/ansible/roles/network-manager/tasks/main.yml b/packer/ansible/roles/network-manager/tasks/main.yml
index 5ffa801..a2b26c8 100644
--- a/packer/ansible/roles/network-manager/tasks/main.yml
+++ b/packer/ansible/roles/network-manager/tasks/main.yml
@@ -14,5 +14,15 @@
       option: ipv4.dhcp-timeout
       value: 300
 
+  - name: create NetworkManager.service.d
+    file:
+      dest: /etc/systemd/system/NetworkManager.service.d
+      state: directory
+
+  - name: configure service override
+    copy:
+      src: override.conf
+      dest: /etc/systemd/system/NetworkManager.service.d/override.conf
+
   tags:
     - network-manager
-- 
2.51.2