From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 21 Oct 2019 18:45:28 +0000 (+0200)
Subject: QoS: Start qosd immediately
X-Git-Tag: v2.23-core137~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=677c1f47d7613f109021dbeac0f280149b4ccca4;p=ipfire-2.x.git

QoS: Start qosd immediately

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index fbc2da95af..dbb07ac553 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -675,8 +675,8 @@ END
 print <<END
 
 	## STARTING COLLECTOR
-	( sleep 10 && /usr/local/bin/qosd $qossettings{'RED_DEV'} >/dev/null 2>&1) &
-	( sleep 10 && /usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1) &
+	/usr/local/bin/qosd $qossettings{'RED_DEV'} >/dev/null 2>&1
+	/usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1
 
 	for i in \$(ls \$RRDLOG/class_*.rrd); do
 		rrdtool update \$i \$(date +%s): 2>/dev/null
@@ -688,7 +688,7 @@ print <<END
   clear|stop)
 	### RESET EVERYTHING TO A KNOWN STATE
 	killall qosd >/dev/null 2>&1
-	(sleep 3 && killall -9 qosd &>/dev/null) &
+
 	# DELETE QDISCS
 	tc qdisc del dev $qossettings{'RED_DEV'} root >/dev/null 2>&1
 	tc qdisc del dev $qossettings{'RED_DEV'} ingress >/dev/null 2>&1