diff options
author | Kai Kang <kai.kang@windriver.com> | 2019-08-30 01:46:09 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-01 22:33:08 +0100 |
commit | 16405efb85553a66827adaa66ebfb41096ca7019 (patch) | |
tree | 3187218b565538ba401e37bda41a8324cf2a3bb3 | |
parent | c4f07b04f69620c33b4c5e8903b408381bc5d0f3 (diff) | |
download | poky-16405efb85553a66827adaa66ebfb41096ca7019.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.
(From OE-Core rev: b4673b5befa339b2ffc3c274b105ab96d730ea2d)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/avahi/files/0001-Fix-opening-etc-resolv.conf-error.patch | 7 |
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. | |||
19 | Upstream-Status: Inappropriate [OE Specific] | 19 | Upstream-Status: Inappropriate [OE Specific] |
20 | 20 | ||
21 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 21 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
22 | |||
23 | When connman installed to image, /etc/resolv.conf is link to | ||
24 | /etc/resolv-conf.connman. So launch avahi-daemon after connman too. | ||
25 | |||
26 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
22 | --- | 27 | --- |
23 | avahi-daemon/avahi-daemon.service.in | 1 + | 28 | avahi-daemon/avahi-daemon.service.in | 1 + |
24 | 1 file changed, 1 insertion(+) | 29 | 1 file changed, 1 insertion(+) |
@@ -31,7 +36,7 @@ index 548c834..63e28e4 100644 | |||
31 | [Unit] | 36 | [Unit] |
32 | Description=Avahi mDNS/DNS-SD Stack | 37 | Description=Avahi mDNS/DNS-SD Stack |
33 | Requires=avahi-daemon.socket | 38 | Requires=avahi-daemon.socket |
34 | +After=systemd-resolved.service | 39 | +After=systemd-resolved.service connman.service |
35 | 40 | ||
36 | [Service] | 41 | [Service] |
37 | Type=dbus | 42 | Type=dbus |