From: Jo-Philipp Wich Date: Tue, 3 Mar 2020 08:28:44 +0000 (+0100) Subject: build: reload rpcd in package postinstall X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ca558f4f93451de7afb2a85c017051cb807b3329;p=oweals%2Fluci.git build: reload rpcd in package postinstall Send a SIGHUP to rpcd after installing LuCI packages to reload ACL rules. Also remove redundant code while we're at it. Signed-off-by: Jo-Philipp Wich --- diff --git a/luci.mk b/luci.mk index 54f3835b4..522a21e76 100644 --- a/luci.mk +++ b/luci.mk @@ -221,25 +221,16 @@ define Package/$(PKG_NAME)/install else true; fi endef -ifneq ($(LUCI_DEFAULTS),) +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)) rm -f /tmp/luci-indexcache rm -rf /tmp/luci-modulecache/ + killall -HUP rpcd 2>/dev/null exit 0 } endef -else -ifndef Package/$(PKG_NAME)/postinst -define Package/$(PKG_NAME)/postinst -[ -n "$${IPKG_INSTROOT}" ] || { - rm -f /tmp/luci-indexcache - rm -rf /tmp/luci-modulecache/ - exit 0 -} -endef -endif endif