Changeset 6026

Timestamp:

04/05/10 18:39:35 (3 years ago)

Author:

jow

Message:

luci-0.9: merge r6024, r6025

Location:

luci/branches/luci-0.9

Files:

• libs/nixio/root/lib/upgrade/luci-add-conffiles.sh (modified) (1 diff)
• modules/admin-core/ipkg/postinst (modified) (1 diff)

luci/branches/luci-0.9/libs/nixio/root/lib/upgrade/luci-add-conffiles.sh

@@ -5 +5 @@
     # 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
 }
 

luci/branches/luci-0.9/modules/admin-core/ipkg/postinst

@@ -3 +3 @@
 [ -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
 }