diff options
| author | Carlos Santos <unixmania@gmail.com> | 2019-10-26 13:17:02 -0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2019-10-26 19:03:15 +0200 |
| commit | 0e51737575bcfbe573c8fe156f1e4a5408aad0fa (patch) | |
| tree | 04dae08998b888004e81adeada9061ea454e712c | |
| parent | f1cb8ca218aa0980efb88a472be719538c030260 (diff) | |
| download | buildroot-0e51737575bcfbe573c8fe156f1e4a5408aad0fa.tar.bz2 | |
package/systemd: create /etc/resolv.conf only if resolved is selected
Or else it becomes a dangling link to
/run/systemd/resolve/resolv.conf, which is never created. Even worst,
it also prevents NetworkManager from updating resolv.conf.
Fixes:
https://bugs.busybox.net/show_bug.cgi?id=9881
Signed-off-by: Carlos Santos <unixmania@gmail.com>
Reviewed-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
| -rw-r--r-- | package/systemd/systemd.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 5961d98b22..df40961fee 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -354,10 +354,6 @@ define SYSTEMD_INSTALL_SERVICE_NETWORKD ln -sf ../../../../lib/systemd/system/systemd-network-generator.service \ $(TARGET_DIR)/etc/systemd/system/network-pre.target.wants/systemd-network-generator.service endef -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 @@ -371,6 +367,10 @@ SYSTEMD_CONF_OPTS += -Dnetworkd=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_RESOLVED),y) +define SYSTEMD_INSTALL_RESOLVCONF_HOOK + ln -sf ../run/systemd/resolve/resolv.conf \ + $(TARGET_DIR)/etc/resolv.conf +endef SYSTEMD_CONF_OPTS += -Dresolve=true SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager define SYSTEMD_INSTALL_SERVICE_RESOLVED |