From d3c16cf4f450dc62adaea4ca77f4b64a29c18c8b Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 2 Nov 2019 13:53:29 +0800 Subject: [PATCH] default-settings: resolve conflict with base-files --- package/lean/default-settings/Makefile | 2 +- package/lean/default-settings/files/zzz-default-settings | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index a156f467ae..040c0aae1e 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -44,7 +44,7 @@ define Package/default-settings/install $(INSTALL_DIR) $(1)/etc $(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_DATA) $(PKG_BUILD_DIR)/*.lmo $(1)/usr/lib/lua/luci/i18n/ - $(INSTALL_DATA) ./files/openwrt_banner $(1)/etc/banner + $(INSTALL_DATA) ./files/openwrt_banner $(1)/etc/openwrt_banner $(INSTALL_BIN) ./files/zzz-default-settings $(1)/etc/uci-defaults/99-default-settings endef diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index f442a956bb..a8a18988f6 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -67,4 +67,6 @@ sed -i 's/cbi.submit\"] = true/cbi.submit\"] = \"1\"/g' /usr/lib/lua/luci/dispat rm -rf /tmp/luci-modulecache/ rm -f /tmp/luci-indexcache +mv /etc/openwrt_banner /etc/banner + exit 0