diff mbox series

[1/1] package/systemd: install resolv.conf with systemd resolve instead of networkd

Message ID 20190811193648.41690-1-james.hilliard1@gmail.com
State Superseded
Headers show
Series [1/1] package/systemd: install resolv.conf with systemd resolve instead of networkd | expand

Commit Message

James Hilliard Aug. 11, 2019, 7:36 p.m. UTC 
Fixes: https://bugs.busybox.net/show_bug.cgi?id=9881

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/systemd/systemd.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Thomas Petazzoni Oct. 27, 2019, 9:04 a.m. UTC | #1 
Hello James,

On Sun, 11 Aug 2019 13:36:48 -0600
James Hilliard <james.hilliard1@gmail.com> wrote:

> Fixes: https://bugs.busybox.net/show_bug.cgi?id=9881
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>

We forgot about your patch, and Carlos recently submitted a similar
patch, which we merged in 0e51737575bcfbe573c8fe156f1e4a5408aad0fa.

Thomas
diff mbox series

Patch

diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index e8fd7967bd..bd0c9d43c8 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -310,10 +310,6 @@  endif
 ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y)
 SYSTEMD_CONF_OPTS += -Dnetworkd=true
 SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - Network Manager
-define SYSTEMD_INSTALL_RESOLVCONF_HOOK
-	ln -sf ../run/systemd/resolve/resolv.conf \
-		$(TARGET_DIR)/etc/resolv.conf
-endef
 SYSTEMD_NETWORKD_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))
 ifneq ($(SYSTEMD_NETWORKD_DHCP_IFACE),)
 define SYSTEMD_INSTALL_NETWORK_CONFS
@@ -329,6 +325,10 @@  endif
 ifeq ($(BR2_PACKAGE_SYSTEMD_RESOLVED),y)
 SYSTEMD_CONF_OPTS += -Dresolve=true
 SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager
+define SYSTEMD_INSTALL_RESOLVCONF_HOOK
+	ln -sf ../run/systemd/resolve/resolv.conf \
+		$(TARGET_DIR)/etc/resolv.conf
+endef
 else
 SYSTEMD_CONF_OPTS += -Dresolve=false
 endif