46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From 78967814f5c37ed67f4cf64d70c9f76a03ee89bc Mon Sep 17 00:00:00 2001
|
|
From: Chen Qi <Qi.Chen@windriver.com>
|
|
Date: Wed, 20 Jun 2018 13:57:35 +0800
|
|
Subject: [PATCH] Fix opening /etc/resolv.conf error
|
|
|
|
Fix to start avahi-daemon after systemd-resolved.service. This is because
|
|
/etc/resolv.conf is a link to /etc/resolv-conf.systemd which in turn is
|
|
a symlink to /run/systemd/resolve/resolv.conf. And /run/systemd/resolve/resolv.conf
|
|
is created by systemd-resolved.service by default in current OE's systemd
|
|
based systems.
|
|
|
|
This fixes errro like below.
|
|
|
|
Failed to open /etc/resolv.conf: Invalid argument
|
|
|
|
In fact, handling of /etc/resolv.conf is quite distro specific. So this patch
|
|
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(+)
|
|
|
|
diff --git a/avahi-daemon/avahi-daemon.service.in b/avahi-daemon/avahi-daemon.service.in
|
|
index 548c834..63e28e4 100644
|
|
--- a/avahi-daemon/avahi-daemon.service.in
|
|
+++ b/avahi-daemon/avahi-daemon.service.in
|
|
@@ -18,6 +18,7 @@
|
|
[Unit]
|
|
Description=Avahi mDNS/DNS-SD Stack
|
|
Requires=avahi-daemon.socket
|
|
+After=systemd-resolved.service connman.service
|
|
|
|
[Service]
|
|
Type=dbus
|
|
--
|
|
2.11.0
|
|
|