From d1c6fa6e767fca2d0c8bd010913769e01f2348db Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Wed, 19 Jun 2024 14:49:27 +0200
Subject: [PATCH] net: Remove NM_IGNORE_DEVICES variable

This variable was originally introduces for the board "Espressobin" (mvebu64): https://github.com/armbian/build/commit/38db0b55f9fbb841e0fe37659bd8b6d8fb0a201a
Use a hook in the mvebu64 and mt7623 family config to set ignored devices for NetworkManager instead.
---
 config/sources/families/mt7623.conf       | 11 ++++++++++-
 config/sources/families/mvebu64.conf      | 11 ++++++++++-
 extensions/network/net-network-manager.sh | 11 +----------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/config/sources/families/mt7623.conf b/config/sources/families/mt7623.conf
index 42e25d3985..df65438295 100644
--- a/config/sources/families/mt7623.conf
+++ b/config/sources/families/mt7623.conf
@@ -30,7 +30,16 @@ CPUMIN=98000
 CPUMAX=1300000
 GOVERNOR="ondemand"
 
-NM_IGNORE_DEVICES="interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*"
+function pre_install_kernel_debs__network_manager_ignore_devices() {
+	display_alert "Board: ${BOARD}: Disabling Network-Manager for all devices" "interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*" "info"
+
+	
+	mkdir -p "${SDCARD}"/etc/NetworkManager/conf.d/
+	cat <<- EOF > "${SDCARD}"/etc/NetworkManager/conf.d/99-ignore-interfaces.conf
+		[keyfile]
+		unmanaged-devices="interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*"
+	EOF
+}
 
 write_uboot_platform() {
 	if [[ $2 == /dev/mmcblk* && -b ${2}boot0 ]]; then
diff --git a/config/sources/families/mvebu64.conf b/config/sources/families/mvebu64.conf
index d7085eee67..fedf638018 100644
--- a/config/sources/families/mvebu64.conf
+++ b/config/sources/families/mvebu64.conf
@@ -72,7 +72,16 @@ CPUMIN=200000
 CPUMAX=1300000
 GOVERNOR=ondemand
 
-NM_IGNORE_DEVICES="interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*"
+function pre_install_kernel_debs__network_manager_ignore_devices() {
+	display_alert "Board: ${BOARD}: Disabling Network-Manager for all devices" "interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*" "info"
+
+	
+	mkdir -p "${SDCARD}"/etc/NetworkManager/conf.d/
+	cat <<- EOF > "${SDCARD}"/etc/NetworkManager/conf.d/99-ignore-interfaces.conf
+		[keyfile]
+		unmanaged-devices="interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*"
+	EOF
+}
 
 write_uboot_platform() {
 	if [[ $BOARD = macchiatobin-doubleshot ]]; then
diff --git a/extensions/network/net-network-manager.sh b/extensions/network/net-network-manager.sh
index e78911f082..f97a368b4b 100644
--- a/extensions/network/net-network-manager.sh
+++ b/extensions/network/net-network-manager.sh
@@ -16,8 +16,7 @@ function add_host_dependencies__install_network_manager() {
 	fi
 }
 
-function pre_install_kernel_debs__configure_network_manager()
-{
+function pre_install_kernel_debs__configure_network_manager() {
 	display_alert "Extension: ${EXTENSION}: Enabling Network-Manager" "" "info"
 
 	# We can't disable/mask systemd-networkd.service since it is required by Netplan
@@ -25,14 +24,6 @@ function pre_install_kernel_debs__configure_network_manager()
 	# Most likely we don't need to wait for nm to get online
 	chroot_sdcard systemctl disable NetworkManager-wait-online.service
 
-	if [[ -n $NM_IGNORE_DEVICES ]]; then
-		mkdir -p "${SDCARD}"/etc/NetworkManager/conf.d/
-		cat <<- EOF > "${SDCARD}"/etc/NetworkManager/conf.d/10-ignore-interfaces.conf
-			[keyfile]
-			unmanaged-devices=$NM_IGNORE_DEVICES
-		EOF
-	fi
-
 	# Copy network config files into the appropriate folders
 	display_alert "Configuring" "NetworkManager and Netplan" "info"
 	local netplan_config_src_folder="${EXTENSION_DIR}/config-nm/netplan/"