summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2019-08-30 01:46:09 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-31 08:44:19 +0100
commitb4673b5befa339b2ffc3c274b105ab96d730ea2d (patch)
tree55366d6338c54f3110974ac55562f93725ca8d48 /meta
parent5d4720dfc8ec29ff3f487f84c5c874678ba20851 (diff)
downloadopenembedded-core-contrib-b4673b5befa339b2ffc3c274b105ab96d730ea2d.tar.gz
avahi: launch avahi-daemon after connman
When connman installed to image, /etc/resolv.conf is link to /etc/resolv-conf.connman. So launch avahi-daemon after connman too just same as after systemd-resolved.service. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/avahi/files/0001-Fix-opening-etc-resolv.conf-error.patch7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/avahi/files/0001-Fix-opening-etc-resolv.conf-error.patch b/meta/recipes-connectivity/avahi/files/0001-Fix-opening-etc-resolv.conf-error.patch
index 11e7e8a9bc..cb8b83fd23 100644
--- a/meta/recipes-connectivity/avahi/files/0001-Fix-opening-etc-resolv.conf-error.patch
+++ b/meta/recipes-connectivity/avahi/files/0001-Fix-opening-etc-resolv.conf-error.patch
@@ -19,6 +19,11 @@ is marked as OE specific.
Upstream-Status: Inappropriate [OE Specific]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+
+When connman installed to image, /etc/resolv.conf is link to
+/etc/resolv-conf.connman. So launch avahi-daemon after connman too.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
avahi-daemon/avahi-daemon.service.in | 1 +
1 file changed, 1 insertion(+)
@@ -31,7 +36,7 @@ index 548c834..63e28e4 100644
[Unit]
Description=Avahi mDNS/DNS-SD Stack
Requires=avahi-daemon.socket
-+After=systemd-resolved.service
++After=systemd-resolved.service connman.service
[Service]
Type=dbus