default-settings: resolve conflict with base-files

This commit is contained in:
CN_SZTL 2019-11-02 13:53:29 +08:00
parent dad976d2c5
commit d3c16cf4f4
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 3 additions and 1 deletions

View File

@ -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

View File

@ -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