From b9292a6f575e5bd440b2011006489c06a3dcb833 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 14 Feb 2020 09:12:31 +0100 Subject: [PATCH] luci.mk: move /tmp/luci-modulecache remove to package postinst script Signed-off-by: Florian Eckert --- .../root/etc/uci-defaults/40_luci-advanced-reboot | 4 ---- .../root/etc/uci-defaults/40_luci-attendedsysupgrade | 1 - .../root/etc/uci-defaults/40_luci-https-dns-proxy | 3 --- .../root/etc/uci-defaults/40_luci-vpn-policy-routing | 3 --- luci.mk | 2 ++ 5 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 applications/luci-app-advanced-reboot/root/etc/uci-defaults/40_luci-advanced-reboot delete mode 100644 applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy delete mode 100644 applications/luci-app-vpn-policy-routing/root/etc/uci-defaults/40_luci-vpn-policy-routing diff --git a/applications/luci-app-advanced-reboot/root/etc/uci-defaults/40_luci-advanced-reboot b/applications/luci-app-advanced-reboot/root/etc/uci-defaults/40_luci-advanced-reboot deleted file mode 100644 index afe697389f..0000000000 --- a/applications/luci-app-advanced-reboot/root/etc/uci-defaults/40_luci-advanced-reboot +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -rm -rf /var/luci-modulecache/; -exit 0 diff --git a/applications/luci-app-attendedsysupgrade/root/etc/uci-defaults/40_luci-attendedsysupgrade b/applications/luci-app-attendedsysupgrade/root/etc/uci-defaults/40_luci-attendedsysupgrade index ceebc6630f..48ae4cc54d 100755 --- a/applications/luci-app-attendedsysupgrade/root/etc/uci-defaults/40_luci-attendedsysupgrade +++ b/applications/luci-app-attendedsysupgrade/root/etc/uci-defaults/40_luci-attendedsysupgrade @@ -1,6 +1,5 @@ #!/bin/sh -rm -rf /tmp/luci-modulecache/ /etc/init.d/uhttpd restart /etc/init.d/rpcd reload diff --git a/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy b/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy deleted file mode 100644 index 2a2f1e7c4b..0000000000 --- a/applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -rm -rf /var/luci-modulecache/ -exit 0 diff --git a/applications/luci-app-vpn-policy-routing/root/etc/uci-defaults/40_luci-vpn-policy-routing b/applications/luci-app-vpn-policy-routing/root/etc/uci-defaults/40_luci-vpn-policy-routing deleted file mode 100644 index afe3de8c60..0000000000 --- a/applications/luci-app-vpn-policy-routing/root/etc/uci-defaults/40_luci-vpn-policy-routing +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -rm -rf /var/luci-modulecache/; -exit 0 diff --git a/luci.mk b/luci.mk index fc02e84f7e..2745797c1f 100644 --- a/luci.mk +++ b/luci.mk @@ -226,6 +226,7 @@ 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/ exit 0 } endef @@ -233,6 +234,7 @@ else define Package/$(PKG_NAME)/postinst [ -n "$${IPKG_INSTROOT}" ] || { rm -f /tmp/luci-indexcache + rm -rf /tmp/luci-modulecache/ exit 0 } endef -- 2.30.2