Updated kernel (2.6.32.28).

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

diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh
index ba3c80a3593de282ec82759bc33519647e1b2e41..eedc44f60b26c9cb47da49d1a7ac7537b2464744 100644 (file)
--- a/config/rootfiles/core/44/update.sh
+++ b/config/rootfiles/core/44/update.sh
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 #
-KVER="2.6.32.27"
+KVER="2.6.32.28"
 MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
 echo $MOUNT > /dev/null
@@ -103,6 +103,12 @@ echo Unpack the updated files ...
 tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
        --no-overwrite-dir
 
+#
+# Change collectd init symlinks
+#
+rm -f /etc/rc.d/rc3.d/S21collectd
+ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S29collectd
+
 # Remove old pakfire cronjob.
 rm -f /etc/fcron.daily/pakfire-update
 
@@ -170,22 +176,48 @@ fi
 mv /var/ipfire/vpn/ipsec.conf /var/ipfire/vpn/ipsec.conf.org
 grep -v "keyexchange=ikev1" /var/ipfire/vpn/ipsec.conf.org > /var/ipfire/vpn/ipsec.conf
 sed -i "s|^conn [A-Za-z].*$|&\n\tkeyexchange=ikev1|g" /var/ipfire/vpn/ipsec.conf
+chown nobody:nobody /var/ipfire/vpn/ipsec.conf
 
 #new squid has some changed options. Build a basic config to be able start squid.
 mv /var/ipfire/proxy/squid.conf /var/ipfire/proxy/squid.conf.org
 grep -v "header_access " /var/ipfire/proxy/squid.conf.org | \
 grep -v "error_directory " | \
+grep -v "cache_dir null" | \
 grep -v "reply_body_max_size 0" > /var/ipfire/proxy/squid.conf
 echo >> /var/ipfire/proxy/squid.conf
 echo error_directory /etc/squid/errors >> /var/ipfire/proxy/squid.conf
+chown nobody:nobody /var/ipfire/proxy/squid.conf
+
+#Convert extrahd entries to UUID
+cp -f /var/ipfire/extrahd/devices /var/ipfire/extrahd/devices.org
+while read entry
+do
+       device=`echo $entry | cut -f1 -d";"`
+       uuid=`blkid  -c /dev/null -s UUID -o value /dev/$device`
+       if [ ! -z $uuid ]; then
+               sed -i -e "s|$device|UUID=$uuid|g" /var/ipfire/extrahd/devices
+               sed -i -e "s|/dev/$device|UUID=$uuid|g" /var/ipfire/extrahd/fstab
+               sed -i -e "s|/dev/$device|UUID=$uuid|g" /etc/fstab
+       fi
+done < /var/ipfire/extrahd/devices.org
 
 #
 # Start services
 #
 /etc/init.d/squid start
 /etc/init.d/snort start
-/etc/init.d/ipsec start
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+       /etc/init.d/ipsec start
+fi
 
+#
+# Rebuild qosscript if enabled
+#
+if [ -e /var/ipfire/qos/enable ]; then
+       /usr/local/bin/qosctrl stop
+       /usr/local/bin/qosctrl generate
+       /usr/local/bin/qosctrl start
+fi
 
 # Add pakfire and fireinfo cronjobs...
 grep -v "# fireinfo" /var/spool/cron/root.orig |
@@ -230,6 +262,10 @@ if [ "${ROOT:0:7}" == "/dev/hd" ];then
        sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /etc/fstab
 fi
 #
+# Don't show gpl on updated systens
+#
+touch /var/ipfire/main/gpl_accepted
+#
 # ReInstall grub
 #
 grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck