From: Piotr Dymacz <pepe2k@gmail.com>
Date: Sun, 16 Jun 2019 20:07:50 +0000 (+0200)
Subject: base-files: drop banner.failsafe if failsafe is disabled
X-Git-Tag: v21.02.0-rc1~728
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8c28da9724636251adf000ef411f57cbff39a383;p=openwrt%2Fstaging%2Fhauke.git

base-files: drop banner.failsafe if failsafe is disabled

Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index fb1267ea5b..47d4e73b42 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk
 include $(INCLUDE_DIR)/feeds.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=241
+PKG_RELEASE:=242
 PKG_FLAGS:=nonshared
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
@@ -202,6 +202,9 @@ define Package/base-files/install
 		$(VERSION_SED_SCRIPT) $(1)/etc/opkg/distfeeds.conf)
 	$(if $(CONFIG_IPK_FILES_CHECKSUMS),, \
 		rm -f $(1)/sbin/pkg_check)
+
+	$(if $(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE), \
+		rm -f $(1)/etc/banner.failsafe,)
 endef
 
 ifneq ($(DUMP),1)