From 5831df18a1c7404dfe15f0c5123a4c709227382f Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Wed, 18 Jul 2018 20:13:47 +0200
Subject: [PATCH] busybox: Avoid conflict with netifd

---
 .../0001-busybox-Try-to-install-everything-into-s-bin.patch    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/patches/openwrt/to-upstream/0001-busybox-Try-to-install-everything-into-s-bin.patch b/patches/openwrt/to-upstream/0001-busybox-Try-to-install-everything-into-s-bin.patch
index be8ab8115..71e113f17 100644
--- a/patches/openwrt/to-upstream/0001-busybox-Try-to-install-everything-into-s-bin.patch
+++ b/patches/openwrt/to-upstream/0001-busybox-Try-to-install-everything-into-s-bin.patch
@@ -12,7 +12,7 @@ diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
 index fc882d3..5d4ba1d 100644
 --- a/package/utils/busybox/Makefile
 +++ b/package/utils/busybox/Makefile
-@@ -132,6 +132,13 @@ endef
+@@ -132,6 +132,14 @@ endef
  define Package/busybox/install
  	$(INSTALL_DIR) $(1)/etc/init.d
  	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
@@ -23,6 +23,7 @@ index fc882d3..5d4ba1d 100644
 +	for i in $(1)/usr/sbin/*; do \
 +		rm -f $$$$i &&	ln -s ../bin/busybox $(1)/sbin/`basename $$$$i`; \
 +	done
++	rm -f $(1)/bin/ifup $(1)/bin/ifdown
  ifneq ($(CONFIG_BUSYBOX_$(BUSYBOX_SYM)_CROND),)
  	$(INSTALL_BIN) ./files/cron $(1)/etc/init.d/cron
  endif
-- 
GitLab