Fix name generation of old core updates.

[people/pmueller/ipfire-2.x.git] / config / rootfiles / core / 45 / update.sh

diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh
index d22779172099f7fd2bce7b6b9278ab76a3e9a4e2..646a5532a06ac3b8c76034e9c9cd6847093e7b5c 100644 (file)
--- a/config/rootfiles/core/45/update.sh
+++ b/config/rootfiles/core/45/update.sh
@@ -24,6 +24,14 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 
+#
+# Remove old core updates from pakfire cache to save space...
+core=45
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
 #
 #Stop services
 echo Stopping Proxy
@@ -35,23 +43,47 @@ killall vpn-watch
 #Extract files
 extract_files
 
+#
+# Remove some addon cronjobs if the addons are not installed
+[ ! -e /opt/pakfire/db/installed/meta-cacti ] && rm -f /etc/fcron.cyclic/cacti.cron
+[ ! -e /opt/pakfire/db/installed/meta-gnump3d ] && rm -f /etc/fcron.daily/gnump3d-index
+[ ! -e /opt/pakfire/db/installed/meta-asterisk ] && rm -f /etc/fcron.minutely/wakeup.sh
+
+# Remove disable cron mails...
+sed "s|MAILTO=root|MAILTO=|g" < /var/spool/cron/root.orig > /var/tmp/root.tmp
+fcrontab /var/tmp/root.tmp
+
+# Disable snort packet decoding alerts
+sed -i "s|#config disable_decode_alerts|config disable_decode_alerts|g" /etc/snort/snort.conf
+sed -i "s|#config disable_tcpopt_alerts|config disable_tcpopt_alerts|g" /etc/snort/snort.conf
+
 #
 #Start services
 echo Starting Proxy
 /etc/init.d/squid start 2>/dev/null
 echo Rewriting Outgoing FW Rules
 /var/ipfire/outgoing/bin/outgoingfw.pl
-echo Starting vpn-watch
-/usr/local/bin/vpn-watch &
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+       echo Starting vpn-watch
+       /usr/local/bin/vpn-watch &
+fi
 
 #
 #Update Language cache
 #perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
+#Disable geode_aes modul
+mv /lib/modules/2.6.32.28-ipfire/kernel/drivers/crypto/geode-aes.ko \
+   /lib/modules/2.6.32.28-ipfire/kernel/drivers/crypto/geode-aes.ko.off >/dev/null 2>&1
+mv /lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/crypto/geode-aes.ko \
+   /lib/modules/2.6.32.28-ipfire-pae/kernel/drivers/crypto/geode-aes.ko.off >/dev/null 2>&1
+mv /lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/crypto/geode-aes.ko \
+   /lib/modules/2.6.32.28-ipfire-xen/kernel/drivers/crypto/geode-aes.ko.off >/dev/null 2>&1
+
 #Rebuild module dep's
-#depmod 2.6.32.28-ipfire
-#depmod 2.6.32.28-ipfire-pae
-#depmod 2.6.32.28-ipfire-xen
+depmod 2.6.32.28-ipfire     >/dev/null 2>&1
+depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1
+depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1
 
 #
 #Finish