Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

[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 40a0895cad214979ab2cdceee1b8d7514d712a1b..2141b3ac0adb4f4ba955584c71495f38692e409c 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
@@ -75,6 +75,8 @@ rm -rf /lib/initcpio
 rm -rf /sbin/mkinitcpio
 # Remove old iw (new is in usr/sbin)
 rm -rf /usr/bin/iw
+# Remove old usb_modeswitch data
+rm -rf /etc/usb_modeswitch.d
 #
 # Backup grub.conf
 #
@@ -103,6 +105,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
 
@@ -176,6 +184,7 @@ chown nobody:nobody /var/ipfire/vpn/ipsec.conf
 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
@@ -199,8 +208,18 @@ done < /var/ipfire/extrahd/devices.org
 #
 /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 |
@@ -245,6 +264,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