ryantimwilson / rpms / systemd

Forked from rpms/systemd 6 days ago
Clone
Zbigniew Jędrzejewski-Szmek d743bb
From b8a7de0282ed299ec0897d00d0743bcf58492063 Mon Sep 17 00:00:00 2001
Zbigniew Jędrzejewski-Szmek d743bb
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Zbigniew Jędrzejewski-Szmek d743bb
Date: Fri, 21 Apr 2017 18:21:17 +0900
Zbigniew Jędrzejewski-Szmek d743bb
Subject: [PATCH] units: systemd-resolved should start before
Zbigniew Jędrzejewski-Szmek d743bb
 network-online.target and nss-lookup.target (#5691)
Zbigniew Jędrzejewski-Szmek d743bb
Zbigniew Jędrzejewski-Szmek d743bb
systemd-resolved provides
Zbigniew Jędrzejewski-Szmek d743bb
1. local API via NSS and D-Bus
Zbigniew Jędrzejewski-Szmek d743bb
2. kind of a local "DNS proxy" through its stub listener
Zbigniew Jędrzejewski-Szmek d743bb
The 1st item should be started before nss-lookup.target.
Zbigniew Jędrzejewski-Szmek d743bb
The 2nd item should be started before network-online.target,
Zbigniew Jędrzejewski-Szmek d743bb
because if the networking works in general, then DNS (and DNS proxy) should too.
Zbigniew Jędrzejewski-Szmek d743bb
Zbigniew Jędrzejewski-Szmek d743bb
Fixes #5650
Zbigniew Jędrzejewski-Szmek d743bb
(cherry picked from commit 3e06055500755053050620a45236ef606507e1bd)
Zbigniew Jędrzejewski-Szmek d743bb
---
Zbigniew Jędrzejewski-Szmek d743bb
 units/systemd-resolved.service.m4.in | 2 ++
Zbigniew Jędrzejewski-Szmek d743bb
 1 file changed, 2 insertions(+)
Zbigniew Jędrzejewski-Szmek d743bb
Zbigniew Jędrzejewski-Szmek d743bb
diff --git a/units/systemd-resolved.service.m4.in b/units/systemd-resolved.service.m4.in
Zbigniew Jędrzejewski-Szmek d743bb
index d3b8f81601..41f696abe5 100644
Zbigniew Jędrzejewski-Szmek d743bb
--- a/units/systemd-resolved.service.m4.in
Zbigniew Jędrzejewski-Szmek d743bb
+++ b/units/systemd-resolved.service.m4.in
Zbigniew Jędrzejewski-Szmek d743bb
@@ -12,6 +12,8 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/resolved
Zbigniew Jędrzejewski-Szmek d743bb
 Documentation=http://www.freedesktop.org/wiki/Software/systemd/writing-network-configuration-managers
Zbigniew Jędrzejewski-Szmek d743bb
 Documentation=http://www.freedesktop.org/wiki/Software/systemd/writing-resolver-clients
Zbigniew Jędrzejewski-Szmek d743bb
 After=systemd-networkd.service network.target
Zbigniew Jędrzejewski-Szmek d743bb
+Before=network-online.target nss-lookup.target
Zbigniew Jędrzejewski-Szmek d743bb
+Wants=nss-lookup.target
Zbigniew Jędrzejewski-Szmek d743bb
 
Zbigniew Jędrzejewski-Szmek d743bb
 # On kdbus systems we pull in the busname explicitly, because it
Zbigniew Jędrzejewski-Szmek d743bb
 # carries policy that allows the daemon to acquire its name.