diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index 929b93f10..6b0afd3e6 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -648,27 +648,27 @@ print </dev/null 2>&1 (sleep 3 && killall -9 qosd &>/dev/null) & # DELETE QDISCS - tc qdisc del dev $qossettings{'RED_DEV'} root - tc qdisc del dev $qossettings{'IMQ_DEV'} root + tc qdisc del dev $qossettings{'RED_DEV'} root >/dev/null 2>&1 + tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1 # STOP IMQ-DEVICE - ip link set $qossettings{'IMQ_DEV'} down - iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0 - rmmod imq + ip link set $qossettings{'IMQ_DEV'} down >/dev/null 2>&1 + iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0 >/dev/null 2>&1 + # rmmod imq # this crash on 2.6.25.xx # REMOVE & FLUSH CHAINS - iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT - iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS - iptables -t mangle --flush QOS-OUT - iptables -t mangle --delete-chain QOS-OUT - iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC - iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS - iptables -t mangle --flush QOS-INC - iptables -t mangle --delete-chain QOS-INC - iptables -t mangle --flush QOS-TOS - iptables -t mangle --delete-chain QOS-TOS - rmmod sch_htb + iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT >/dev/null 2>&1 + iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1 + iptables -t mangle --flush QOS-OUT >/dev/null 2>&1 + iptables -t mangle --delete-chain QOS-OUT >/dev/null 2>&1 + iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC >/dev/null 2>&1 + iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1 + iptables -t mangle --flush QOS-INC >/dev/null 2>&1 + iptables -t mangle --delete-chain QOS-INC >/dev/null 2>&1 + iptables -t mangle --flush QOS-TOS >/dev/null 2>&1 + iptables -t mangle --delete-chain QOS-TOS >/dev/null 2>&1 + rmmod sch_htb >/dev/null 2>&1 echo "Quality of Service was successfully cleared!" ;; gen|generate) diff --git a/config/rootfiles/updater/filelists/files b/config/rootfiles/updater/filelists/files index 4ef61a038..9d5aca9de 100644 --- a/config/rootfiles/updater/filelists/files +++ b/config/rootfiles/updater/filelists/files @@ -48,6 +48,7 @@ var/ipfire/sensors/ var/ipfire/menu.d/20-status.menu var/ipfire/graphs.pl var/ipfire/firebuild +var/ipfire/qos/bin/makeqosscripts.pl var/ipfire/proxy/advanced/useragents srv/web/ipfire/html/images/updbooster/ srv/web/ipfire/cgi-bin/updatexlrator.cgi diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network index a02c58581..90f811384 100644 --- a/src/initscripts/init.d/network +++ b/src/initscripts/init.d/network @@ -120,6 +120,8 @@ case "${DO}" in # Stopping dnsmasq if network all networks shutdown [ "${ALL}" == "1" ] && /etc/rc.d/init.d/dnsmasq stop + + exit 0 ;; restart)