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