webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed output of qos.sh clear

Browse Source 
removed unload of imq module at qos clear (crash at 2.6.25)
network stop red ends now with exit 0 (errorcode at disconnect)
This commit is contained in:
Arne Fitzenreiter
2008-10-12 10:49:50 +02:00
parent 2219b263eb
commit a410968257
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
config/qos/makeqosscripts.pl
View File

@@ -648,27 +648,27 @@ print <<END
;;
clear|stop)
### RESET EVERYTHING TO A KNOWN STATE
killall qosd
killall qosd >/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)

1
config/rootfiles/updater/filelists/files
View File

@@ -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

2
src/initscripts/init.d/network
View File

@@ -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)