Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Francisco Gil 2025-03-06 15:50:20 +01:00
parent 738588064e
commit 3422efda37
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf
View File

@ -1,8 +1,8 @@
[main] [main]
plugins=ifupdown,keyfile plugins=ifupdown,keyfile
no-auto-default=type:ethernet no-auto-default=type:ethernet
dns=dnsmasq dns=##DNS_MANAGER##
rc-manager=file rc-manager=##RC_MANAGER##
[ifupdown] [ifupdown]
managed=false managed=false

6
meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend
View File

@ -23,7 +23,7 @@ SRC_URI += " \
# Adjust compile time options: # Adjust compile time options:
# * consolekit depends on X11. Disable to allow building framebuffer images. # * 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" 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 = "interface-name:p2p*;interface-name:wlan1"
UNMANAGED_DEVICES:ccimx9 = "interface-name:p2p-wfd0-0;interface-name:wfd0;interface-name:uap0" 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 inherit update-rc.d
@ -55,6 +57,8 @@ do_install:append() {
# Customize NetworkManager # Customize NetworkManager
# #
sed -i -e "s,##UNMANAGED_DEVICES##,${UNMANAGED_DEVICES},g" ${D}${sysconfdir}/NetworkManager/NetworkManager.conf 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 # Connections config files

9
meta-digi-dey/recipes-support/dnsmasq/dnsmasq_%.bbappend
View File

@ -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"