From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 5 Apr 2010 17:39:35 +0000 (+0000)
Subject: luci-0.9: merge r6024, r6025
X-Git-Tag: 0.9.0~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f77d92b2bee1b2878b1b08b09763a9f47606503d;p=oweals%2Fluci.git

luci-0.9: merge r6024, r6025
---

diff --git a/libs/nixio/root/lib/upgrade/luci-add-conffiles.sh b/libs/nixio/root/lib/upgrade/luci-add-conffiles.sh
index 0d9925761..77399b987 100644
--- a/libs/nixio/root/lib/upgrade/luci-add-conffiles.sh
+++ b/libs/nixio/root/lib/upgrade/luci-add-conffiles.sh
@@ -4,8 +4,12 @@ add_luci_conffiles()
 
 	# save ssl certs
 	if [ -d /etc/nixio ]; then
-		find /etc/nixio >> $filelist
+		find /etc/nixio -type f >> $filelist
 	fi
+
+	# save uhttpd certs
+	[ -f "/etc/uhttpd.key" ] && echo /etc/uhttpd.key >> $filelist
+	[ -f "/etc/uhttpd.crt" ] && echo /etc/uhttpd.crt >> $filelist
 }
 
 sysupgrade_init_conffiles="$sysupgrade_init_conffiles add_luci_conffiles"
diff --git a/modules/admin-core/ipkg/postinst b/modules/admin-core/ipkg/postinst
index 2ab7c0e2c..a756b5b29 100755
--- a/modules/admin-core/ipkg/postinst
+++ b/modules/admin-core/ipkg/postinst
@@ -2,7 +2,6 @@
 
 [ -n "${IPKG_INSTROOT}" ] || {
 	/etc/init.d/luci_fixtime enabled || /etc/init.d/luci_fixtime enable
-	/etc/init.d/luci_ethers enabled || /etc/init.d/luci_ethers enable
-	/etc/init.d/luci_hosts enabled || /etc/init.d/luci_hosts enable
+	/etc/init.d/luci_dhcp_migrate enabled || /etc/init.d/luci_dhcp_migrate enable
 	exit 0
 }