Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

Conflicts:
	config/rootfiles/core/44/filelists/files

config/rootfiles/core/44/filelists/files

@@ -40,6 +40,7 @@ var/ipfire/langs/fr.pl
 var/ipfire/langs/es.pl
 var/ipfire/menu.d/10-system.menu
 usr/local/bin/fireinfoctrl
+var/ipfire/qos/bin/makeqosscripts.pl
 usr/local/bin/timectrl
 usr/local/bin/rebuild-initrd
 usr/local/bin/scanhd

config/rootfiles/core/44/update.sh

@@ -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
 
@@ -204,6 +210,15 @@ 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 |
 grep -v "/usr/bin/sendprofile" |