applications/luci-splash: Use conffiles to store splashtext on sysupgrade

diff --git a/applications/luci-splash/ipkg/postinst b/applications/luci-splash/ipkg/postinst
index b35f1636e24ad9240a71ea91d445502e45d1fea4..a87729e43155b40357ab349dda0c1f6bd67197c8 100755 (executable)
--- a/applications/luci-splash/ipkg/postinst
+++ b/applications/luci-splash/ipkg/postinst
@@ -2,6 +2,5 @@
 
 [ -n "${IPKG_INSTROOT}" ] || {
        /etc/init.d/luci_splash enabled || /etc/init.d/luci_splash enable
-       uci set luci.flash_keep.splashtext="/usr/lib/luci-splash/splashtext.html";uci commit
        exit 0
 }

diff --git a/applications/luci-splash/ipkg/postrm b/applications/luci-splash/ipkg/postrm
deleted file mode 100644 (file)
index 4c92415..0000000
--- a/applications/luci-splash/ipkg/postrm
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-uci del luci.flash_keep.splashtext;uci commit

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index f65cdfa80a1c274791a6cd4ec69cbf785e4602d8..786a84ad268f0da1fbfd6ddb2121d7ccae82f797 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -308,6 +308,7 @@ endef
 
 define Package/luci-app-splash/conffiles
 /etc/config/luci_splash
+/usr/lib/luci-splash/splashtext.html
 endef
 
 define Package/luci-app-statistics/conffiles