From 3422efda373cae58e3fac4f0153be99ea9616141 Mon Sep 17 00:00:00 2001
From: Francisco Gil <francisco.gilmartinez@digi.com>
Date: Thu, 6 Mar 2025 15:50:20 +0100
Subject: [PATCH] nm: remove dnsmasq as DNS manager

dnsmaqs is not able to manage DNS from cellular interface.

Now, DNS is managed by systemd-resolved on platforms with
systemd and by NetworkManager on sysvinit platforms.

https://onedigi.atlassian.net/browse/DEL-9353

Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
---
 .../networkmanager/networkmanager/NetworkManager.conf    | 4 ++--
 .../networkmanager/networkmanager_%.bbappend             | 6 +++++-
 meta-digi-dey/recipes-support/dnsmasq/dnsmasq_%.bbappend | 9 ---------
 3 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-support/dnsmasq/dnsmasq_%.bbappend

diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf
index e79beed5b..141b14d13 100644
--- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf
+++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf
@@ -1,8 +1,8 @@
 [main]
 plugins=ifupdown,keyfile
 no-auto-default=type:ethernet
-dns=dnsmasq
-rc-manager=file
+dns=##DNS_MANAGER##
+rc-manager=##RC_MANAGER##
 
 [ifupdown]
 managed=false
diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend
index 4a4aeb376..12160f06f 100644
--- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend
+++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend
@@ -23,7 +23,7 @@ SRC_URI += " \
 # Adjust compile time options:
 #   * consolekit depends on X11. Disable to allow building framebuffer images.
 #
-PACKAGECONFIG:remove:dey = "consolekit nss"
+PACKAGECONFIG:remove:dey = "consolekit dnsmasq nss"
 PACKAGECONFIG:append = " gnutls modemmanager ppp concheck"
 
 #
@@ -43,6 +43,8 @@ WLAN0_STATIC_CIDR = "${@ipaddr_to_cidr('wlan0', d)}"
 
 UNMANAGED_DEVICES = "interface-name:p2p*;interface-name:wlan1"
 UNMANAGED_DEVICES:ccimx9 = "interface-name:p2p-wfd0-0;interface-name:wfd0;interface-name:uap0"
+DNS_MANAGER = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd-resolved','default', d)}"
+RC_MANAGER = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'unmanaged', 'file', d)}"
 
 inherit update-rc.d
 
@@ -55,6 +57,8 @@ do_install:append() {
 	# Customize NetworkManager
 	#
 	sed -i -e "s,##UNMANAGED_DEVICES##,${UNMANAGED_DEVICES},g" ${D}${sysconfdir}/NetworkManager/NetworkManager.conf
+	sed -i -e "s,##DNS_MANAGER##,${DNS_MANAGER},g" ${D}${sysconfdir}/NetworkManager/NetworkManager.conf
+	sed -i -e "s,##RC_MANAGER##,${RC_MANAGER},g" ${D}${sysconfdir}/NetworkManager/NetworkManager.conf
 
 	#
 	# Connections config files
diff --git a/meta-digi-dey/recipes-support/dnsmasq/dnsmasq_%.bbappend b/meta-digi-dey/recipes-support/dnsmasq/dnsmasq_%.bbappend
deleted file mode 100644
index be2269f60..000000000
--- a/meta-digi-dey/recipes-support/dnsmasq/dnsmasq_%.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) 2017, Digi International Inc.
-
-# Enable DBUS support so it can be used from NetworkManager
-PACKAGECONFIG:append = " dbus"
-
-# NetworkManager will launch 'dnsmasq' using DBUS, so disable the creation
-# of runlevel's symlinks and disable its systemd service.
-INHIBIT_UPDATERCD_BBCLASS = "1"
-SYSTEMD_AUTO_ENABLE = "disable"