Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --combined config/rootfiles/oldcore/168/update.sh
index 283cb10987ccf42aa6302876f5f5f9b79f307bb1,6bb081ff28d2ce54384e6509752a80a470a1a0ba..418c4939958d6afd735d69e1ddd321d66c4822d5
--- 1/config/rootfiles/core/168/update.sh
--- 2/config/rootfiles/oldcore/168/update.sh
+++ b/config/rootfiles/oldcore/168/update.sh
@@@ -120,6 -120,16 +120,16 @@@ case "$(uname -m)" i
                  ;;
  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
@@@ -133,22 -143,6 +143,22 @@@ if grep -q "ENABLED=on" /var/ipfire/vpn
         /etc/init.d/ipsec start
  fi
  
 +# krb5 is now part of the core system, remove Pakfire metadata for it
 +if [ -e "/opt/pakfire/db/installed/meta-krb5" ] && [ -e "/opt/pakfire/db/meta/meta-krb5" ]; then
 +      rm -vf \
 +              /opt/pakfire/db/installed/meta-krb5 \
 +              /opt/pakfire/db/meta/meta-krb5 \
 +              /opt/pakfire/db/rootfiles/krb5
 +fi
 +
 +# libtiff is now part of the core system, remove Pakfire metadata for it
 +if [ -e "/opt/pakfire/db/installed/meta-libtiff" ] && [ -e "/opt/pakfire/db/meta/meta-libtiff" ]; then
 +      rm -vf \
 +              /opt/pakfire/db/installed/meta-libtiff \
 +              /opt/pakfire/db/meta/meta-libtiff \
 +              /opt/pakfire/db/rootfiles/libtiff
 +fi
 +
  # This update needs a reboot...
  touch /var/run/need_reboot