1From 78967814f5c37ed67f4cf64d70c9f76a03ee89bc Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 20 Jun 2018 13:57:35 +0800
4Subject: [PATCH] Fix opening /etc/resolv.conf error
5
6Fix to start avahi-daemon after systemd-resolved.service. This is because
7/etc/resolv.conf is a link to /etc/resolv-conf.systemd which in turn is
8a symlink to /run/systemd/resolve/resolv.conf. And /run/systemd/resolve/resolv.conf
9is created by systemd-resolved.service by default in current OE's systemd
10based systems.
11
12This fixes errro like below.
13
14  Failed to open /etc/resolv.conf: Invalid argument
15
16In fact, handling of /etc/resolv.conf is quite distro specific. So this patch
17is marked as OE specific.
18
19Upstream-Status: Inappropriate [OE Specific]
20
21Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
22
23When connman installed to image, /etc/resolv.conf is link to
24/etc/resolv-conf.connman. So launch avahi-daemon after connman too.
25
26Signed-off-by: Kai Kang <kai.kang@windriver.com>
27---
28 avahi-daemon/avahi-daemon.service.in | 1 +
29 1 file changed, 1 insertion(+)
30
31diff --git a/avahi-daemon/avahi-daemon.service.in b/avahi-daemon/avahi-daemon.service.in
32index 548c834..63e28e4 100644
33--- a/avahi-daemon/avahi-daemon.service.in
34+++ b/avahi-daemon/avahi-daemon.service.in
35@@ -18,6 +18,7 @@
36 [Unit]
37 Description=Avahi mDNS/DNS-SD Stack
38 Requires=avahi-daemon.socket
39+After=systemd-resolved.service connman.service
40
41 [Service]
42 Type=dbus
43--
442.11.0
45
46