From: Arne Fitzenreiter Date: Thu, 7 Aug 2014 02:31:58 +0000 (+0200) Subject: core81: change updatescript for core81. X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=4d3e174578dade4cb110ec7f370beb449fcaa48d core81: change updatescript for core81. --- diff --git a/config/rootfiles/core/81/update.sh b/config/rootfiles/core/81/update.sh index 67244c654..743a1d31a 100644 --- a/config/rootfiles/core/81/update.sh +++ b/config/rootfiles/core/81/update.sh @@ -25,68 +25,23 @@ /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # Remove old core updates from pakfire cache to save space... -core=80 +core=81 for (( i=1; i<=$core; i++ )) do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done # Stop services -/etc/init.d/ipsec stop # Remove old strongswan files -rm -f \ - /etc/strongswan.d/charon/unity.conf \ - /usr/lib/ipsec/plugins/libstrongswan-unity.so \ - /usr/share/strongswan/templates/config/plugins/unity.conf - -rm -f /usr/local/bin/setddns.pl # Extract files extract_files # Start services -/etc/init.d/dnsmasq restart -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - # Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# Uninstall the libgpg-error package. -rm -f \ - /opt/pakfire/db/installed/meta-libgpg-error \ - /opt/pakfire/db/rootfiles/libgpg-error - -# Fix broken proxy configuration permissions -chown -R nobody.nobody \ - /var/ipfire/proxy/advanced \ - /var/ipfire/proxy/acl-1.4 \ - /var/ipfire/proxy/enable \ - /var/ipfire/proxy/settings \ - /var/ipfire/proxy/squid.conf \ - /var/ipfire/proxy/transparent - -# Regenerate squid configuration file -sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi - -# Generate ddns configuration file -sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi - -# Update crontab -sed -i /var/spool/cron/root.orig -e "/setddns.pl/d" - -grep -q /usr/bin/ddns /var/spool/cron/root.orig || cat <> /var/spool/cron/root.orig - -# Update dynamic DNS records every five minutes. -# Force an update once a month -*/5 * * * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all -3 2 1 * * [ -f "/var/ipfire/red/active" ] && /usr/bin/ddns update-all --force -EOF - -fcrontab -z &>/dev/null +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" sync