Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-0.9: merge r6024, r6025

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-04-05 17:39:35 +00:00
parent 4efb7b28fa
commit f77d92b2be
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/nixio/root/lib/upgrade/luci-add-conffiles.sh
View file

@ -4,8 +4,12 @@ add_luci_conffiles()
# save ssl certs # save ssl certs
if [ -d /etc/nixio ]; then if [ -d /etc/nixio ]; then
find /etc/nixio >> $filelist find /etc/nixio -type f >> $filelist
fi 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" sysupgrade_init_conffiles="$sysupgrade_init_conffiles add_luci_conffiles"

3
modules/admin-core/ipkg/postinst
View file

@ -2,7 +2,6 @@
[ -n "${IPKG_INSTROOT}" ] || { [ -n "${IPKG_INSTROOT}" ] || {
/etc/init.d/luci_fixtime enabled || /etc/init.d/luci_fixtime enable /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_dhcp_migrate enabled || /etc/init.d/luci_dhcp_migrate enable
/etc/init.d/luci_hosts enabled || /etc/init.d/luci_hosts enable
exit 0 exit 0
} }