From 9de7ca152e9f22bc5eabbdfdfa0504028d48fb21 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sun, 8 Mar 2020 23:50:02 -0300 Subject: [PATCH] package/ifupdown-scripts: relocate the generation the interfaces file Generate it in the IFUPDOWN_SCRIPTS_INSTALL_INIT_ hook. This will allow creating a file to configure an interface via DHCP for the openrc network service, in a forthcoming change. Signed-off-by: Carlos Santos Signed-off-by: Yann E. MORIN --- package/ifupdown-scripts/ifupdown-scripts.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/ifupdown-scripts/ifupdown-scripts.mk b/package/ifupdown-scripts/ifupdown-scripts.mk index d387c530f1..16fef783dd 100644 --- a/package/ifupdown-scripts/ifupdown-scripts.mk +++ b/package/ifupdown-scripts/ifupdown-scripts.mk @@ -32,13 +32,13 @@ define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(IFUPDOWN_SCRIPTS_PKGDIR)/nfs_check \ $(TARGET_DIR)/etc/network/nfs_check $(call SYSTEM_RSYNC,$(IFUPDOWN_SCRIPTS_PKGDIR)/network,$(TARGET_DIR)/etc/network) - $(IFUPDOWN_SCRIPTS_LOCALHOST) - $(IFUPDOWN_SCRIPTS_DHCP) endef define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 $(IFUPDOWN_SCRIPTS_PKGDIR)/S40network \ $(TARGET_DIR)/etc/init.d/S40network + $(IFUPDOWN_SCRIPTS_LOCALHOST) + $(IFUPDOWN_SCRIPTS_DHCP) endef # ifupdown-scripts can not be selected when systemd-networkd is @@ -47,6 +47,8 @@ endef define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(IFUPDOWN_SCRIPTS_PKGDIR)/network.service \ $(TARGET_DIR)/etc/systemd/system/network.service + $(IFUPDOWN_SCRIPTS_LOCALHOST) + $(IFUPDOWN_SCRIPTS_DHCP) endef $(eval $(generic-package)) -- 2.30.2