From 6ee48b1575f609735286e7a32925194570078a22 Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Sun, 7 Jan 2024 14:51:31 +0100
Subject: [PATCH] Networking fixed

---
 .../etc/NetworkManager/NetworkManager.conf    |  5 +-
 builder/data/etc/dhcpcd.conf                  | 62 +++++++++++++++++++
 builder/raspberrypi64.yml                     |  1 +
 3 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 builder/data/etc/dhcpcd.conf

diff --git a/builder/data/etc/NetworkManager/NetworkManager.conf b/builder/data/etc/NetworkManager/NetworkManager.conf
index d51c1e76..2de0bf22 100644
--- a/builder/data/etc/NetworkManager/NetworkManager.conf
+++ b/builder/data/etc/NetworkManager/NetworkManager.conf
@@ -1,5 +1,6 @@
 [main]
-plugins=ifupdown,keyfile
+plugins=ifupdown
+dhcp=dhcpcd
 
 [ifupdown]
-managed=true
\ No newline at end of file
+managed=false
\ No newline at end of file
diff --git a/builder/data/etc/dhcpcd.conf b/builder/data/etc/dhcpcd.conf
new file mode 100644
index 00000000..90444ad0
--- /dev/null
+++ b/builder/data/etc/dhcpcd.conf
@@ -0,0 +1,62 @@
+# A sample configuration for dhcpcd.
+# See dhcpcd.conf(5) for details.
+
+# Allow users of this group to interact with dhcpcd via the control socket.
+#controlgroup wheel
+
+# Inform the DHCP server of our hostname for DDNS.
+hostname
+
+# Use the hardware address of the interface for the Client ID.
+clientid
+# or
+# Use the same DUID + IAID as set in DHCPv6 for DHCPv4 ClientID as per RFC4361.
+# Some non-RFC compliant DHCP servers do not reply with this set.
+# In this case, comment out duid and enable clientid above.
+#duid
+
+# Persist interface configuration when dhcpcd exits.
+persistent
+
+# Rapid commit support.
+# Safe to enable by default because it requires the equivalent option set
+# on the server to actually work.
+option rapid_commit
+
+# A list of options to request from the DHCP server.
+option domain_name_servers, domain_name, domain_search, host_name
+option classless_static_routes
+# Respect the network MTU. This is applied to DHCP routes.
+option interface_mtu
+
+# Most distributions have NTP support.
+#option ntp_servers
+
+# A ServerID is required by RFC2131.
+require dhcp_server_identifier
+
+# Generate SLAAC address using the Hardware Address of the interface
+#slaac hwaddr
+# OR generate Stable Private IPv6 Addresses based from the DUID
+slaac private
+
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+# !! DO NOT EDIT THESE LINES BELOW PLEASE !!
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+# static IP configuration:
+denyinterfaces wlan0
+
+interface eth0
+static domain_name_servers=8.8.8.8 1.1.1.1
+metric 201
+
+interface usb0
+static ip_address=10.0.0.2/24
+static routers=10.0.0.1
+static domain_name_servers=10.0.0.1 8.8.8.8 1.1.1.1
+metric 202
+
+interface bnep0
+static domain_name_servers=8.8.8.8 1.1.1.1
+metric 203
\ No newline at end of file
diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml
index 1637287a..38afd527 100644
--- a/builder/raspberrypi64.yml
+++ b/builder/raspberrypi64.yml
@@ -71,6 +71,7 @@
           - bluez
           - build-essential
           - curl
+          - dhcpcd5
           - dkms
           - dphys-swapfile
           - fbi