From: Manuel Munz <freifunk@somakoma.de>
Date: Wed, 24 Nov 2010 01:07:45 +0000 (+0000)
Subject: applications/luci-splash: Use conffiles to store splashtext on sysupgrade
X-Git-Tag: 0.10.0~376
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cbe2cb545ce847ddb488ecf52141f560f6cab9ed;p=oweals%2Fluci.git

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 b35f1636e..a87729e43 100755
--- 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
index 4c92415d9..000000000
--- 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 f65cdfa80..786a84ad2 100644
--- 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