From: Drew Moseley <drew.mose...@northern.tech>
This brings the networkmanager in sync with how systemd-resolved and connman
work. Additionally this allows it to function with a read-only rootFS.
Signed-off-by: Drew Moseley <drew.mose...@northern.tech>
---
.../networkmanager/networkmanager_1.14.4.bb | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git
a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb
b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb
index 26c40a5..86a5322 100644
---
a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb
+++
b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb
@@ -20,7 +20,7 @@ DEPENDS = " \
curl \
"
-inherit gnomebase gettext systemd bluetooth bash-completion vala
gobject-introspection gtk-doc
+inherit gnomebase gettext systemd bluetooth bash-completion vala
gobject-introspection gtk-doc update-alternatives
SRC_URI = " \
${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz
\
@@ -138,6 +138,16 @@ FILES_${PN}-nmtui-doc = " \
SYSTEMD_SERVICE_${PN} = "NetworkManager.service
NetworkManager-dispatcher.service"
+ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_${PN} =
"${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}"
+ALTERNATIVE_TARGET[resolv-conf] =
"${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.NetworkManager','',d)}"
+ALTERNATIVE_LINK_NAME[resolv-conf] =
"${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}"
+
do_install_append() {
rm -rf ${D}/run ${D}${localstatedir}/run
+
+ # For read-only filesystem, do not create links during bootup
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};
then
+ ln -sf ../run/NetworkManager/resolv.conf
${D}${sysconfdir}/resolv-conf.NetworkManager
+ fi
}
--
2.7.4
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
