From: Sven Roederer <redacted>
Date: Fri, 4 Jun 2021 21:04:37 +0000 (+0200)
Subject: luci.mk: don't run uci-defaults scripts ourself
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=70631277db2dad7a950396275783d8856a15a136;p=openwrt-luci.git

luci.mk: don't run uci-defaults scripts ourself

Do not run the uci-defaults scripts of a package in the package-postinst, but leave this
for the default_postinst() of the OpenWrt base-files package.

Signed-off-by: Sven Roederer <redacted>
---

diff --git a/luci.mk b/luci.mk
index 636cf316ec..fb49da0eee 100644
--- a/luci.mk
+++ b/luci.mk
@@ -206,8 +206,7 @@ endef
 
 ifndef Package/$(PKG_NAME)/postinst
 define Package/$(PKG_NAME)/postinst
-[ -n "$${IPKG_INSTROOT}" ] || {$(foreach script,$(LUCI_DEFAULTS),
-	(. /etc/uci-defaults/$(script)) && rm -f /etc/uci-defaults/$(script))
+[ -n "$${IPKG_INSTROOT}" ] || { \
 	rm -f /tmp/luci-indexcache
 	rm -rf /tmp/luci-modulecache/
 	killall -HUP rpcd 2>/dev/null