From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 20 Oct 2019 20:21:23 +0000 (+0000)
Subject: Revert "QoS: Start qosd immediately"
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb8d7759b85027cda6c4b3901cc48a06357fb0c1;p=people%2Fms%2Fipfire-2.x.git

Revert "QoS: Start qosd immediately"

This reverts commit 6a9bcd6c1d7ac0f8f4926a886beb8b3989227874.
---

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index e46ad85f28..8a8591bbe2 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -654,8 +654,8 @@ END
 print <<END
 
 	## STARTING COLLECTOR
-	/usr/local/bin/qosd $qossettings{'RED_DEV'} >/dev/null 2>&1
-	/usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1
+	( 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) &
 
 	for i in \$(ls \$RRDLOG/class_*.rrd); do
 		rrdtool update \$i \$(date +%s): 2>/dev/null
@@ -667,7 +667,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