diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index fa0b6edf0..18a3acec5 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -156,7 +156,7 @@ case "\$1" in ### SET QUEUE LENGTH & MTU - has just to be tested!!! IMPORTANT ip link set dev $qossettings{'RED_DEV'} qlen $qossettings{'QLENGTH'} - ip link set dev $qossettings{'RED_DEV'} mtu $qossettings{'MTU'} + #ip link set dev $qossettings{'RED_DEV'} mtu $qossettings{'MTU'} ### ADD HTB QDISC FOR $qossettings{'RED_DEV'} tc qdisc add dev $qossettings{'RED_DEV'} root handle 1: htb default $qossettings{'DEFCLASS_OUT'} diff --git a/config/rootfiles/core/1/files b/config/rootfiles/core/1/files index 9f15b21f9..9f88ed2d9 100644 --- a/config/rootfiles/core/1/files +++ b/config/rootfiles/core/1/files @@ -5,3 +5,4 @@ opt/pakfire/lib/functions.sh srv/web/ipfire/cgi-bin/updatexlrator.cgi usr/sbin/updxlrator var/ipfire/updatexlrator/bin/download +etc/httpd/conf/vhosts.d/ipfire-interface.conf diff --git a/config/rootfiles/core/1/update.sh b/config/rootfiles/core/1/update.sh index e5442e410..465a6deb0 100644 --- a/config/rootfiles/core/1/update.sh +++ b/config/rootfiles/core/1/update.sh @@ -4,5 +4,3 @@ extract_files mv /srv/web/ipfire/html/updatecache /var/ /etc/init.d/squid restart - -reload_all diff --git a/config/rootfiles/core/2/files b/config/rootfiles/core/2/files new file mode 100644 index 000000000..e71d0fdc2 --- /dev/null +++ b/config/rootfiles/core/2/files @@ -0,0 +1,2 @@ +srv/web/ipfire/cgi-bin/qos.cgi +var/ipfire/qos/bin/makeqosscripts.pl diff --git a/config/rootfiles/core/2/meta b/config/rootfiles/core/2/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/core/2/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/2/update.sh b/config/rootfiles/core/2/update.sh new file mode 100644 index 000000000..a47a7831d --- /dev/null +++ b/config/rootfiles/core/2/update.sh @@ -0,0 +1,4 @@ +#!/bin/bash +. /opt/pakfire/lib/functions.sh + +extract_files diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 9674a8a9f..6ba65b671 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -570,6 +570,11 @@ END $qossettings{'DEFCLASS_INC'} = "210"; $qossettings{'DEFCLASS_OUT'} = "110"; $qossettings{'ACK'} ="101"; + system("/usr/local/bin/qosctrl generate >/dev/null 2>&1"); + system("/usr/bin/touch /var/ipfire/qos/enable"); + system("/usr/local/bin/qosctrl start >/dev/null 2>&1"); + system("logger -t ipfire 'QoS started'"); + $qossettings{'ENABLED'} = 'on'; &General::writehash("${General::swroot}/qos/settings", \%qossettings); } @@ -1149,7 +1154,7 @@ END