Core Update 168: Ship fcrontab and rebuild it from scratch

[ipfire-2.x.git] / config / rootfiles / core / 168 / update.sh

diff --git a/config/rootfiles/core/168/update.sh b/config/rootfiles/core/168/update.sh
index d21f648ddb72ccecade910f5946d57ad94c98a36..6bb081ff28d2ce54384e6509752a80a470a1a0ba 100644 (file)
--- a/config/rootfiles/core/168/update.sh
+++ b/config/rootfiles/core/168/update.sh
@@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
+/etc/init.d/ipsec stop
 /etc/init.d/squid stop
 /usr/local/bin/openvpnctrl -k
 /usr/local/bin/openvpnctrl -kn2n
@@ -119,6 +120,16 @@ case "$(uname -m)" in
                 ;;
 esac
 
+# Add rd.auto to kernel command line
+if ! grep -q rd.auto /etc/default/grub; then
+       sed -e "s/panic=10/& rd.auto/" -i /etc/default/grub
+fi
+
+# Repair any broken MDRAID arrays
+/usr/local/bin/repair-mdraid
+
+# Rebuild fcrontab from scratch
+/usr/bin/fcrontab -z
 
 # Start services
 /etc/init.d/fcron restart
@@ -128,6 +139,9 @@ esac
 /usr/local/bin/openvpnctrl -s
 /usr/local/bin/openvpnctrl -sn2n
 /etc/init.d/suricata start
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+       /etc/init.d/ipsec start
+fi
 
 # This update needs a reboot...
 touch /var/run/need_reboot