summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFlorian Eckert <fe@dev.tdt.de>2020-02-14 09:12:31 +0100
committerFlorian Eckert <fe@dev.tdt.de>2020-02-14 09:20:48 +0100
commitb9292a6f575e5bd440b2011006489c06a3dcb833 (patch)
tree8b3cda8ae6e645a9494b51f9240a4e194a2618b3
parent1f8a3c04178e21f45f3908fd476ec3b3dad73c69 (diff)
luci.mk: move /tmp/luci-modulecache remove to package postinst script
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
-rw-r--r--applications/luci-app-advanced-reboot/root/etc/uci-defaults/40_luci-advanced-reboot4
-rwxr-xr-xapplications/luci-app-attendedsysupgrade/root/etc/uci-defaults/40_luci-attendedsysupgrade1
-rw-r--r--applications/luci-app-https-dns-proxy/root/etc/uci-defaults/40_luci-https-dns-proxy3
-rw-r--r--applications/luci-app-vpn-policy-routing/root/etc/uci-defaults/40_luci-vpn-policy-routing3
-rw-r--r--luci.mk2
5 files changed, 2 insertions, 11 deletions
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 afe697389..000000000
--- 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 ceebc6630..48ae4cc54 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 2a2f1e7c4..000000000
--- 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 afe3de8c6..000000000
--- 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 fc02e84f7..2745797c1 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