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 0d99257619d6ef489c6bcad801128b18f3be472c..77399b98724ff2dfc93a8f9c17ab3fb086242d6a 100644 (file)
--- 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 2ab7c0e2ce65afaddaa21bd4c886b5b8eeae7338..a756b5b29aa25861b736881d64848bdcaa3af281 100755 (executable)
--- 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
 }