core163: add cake changes to updater

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/core/163/filelists/files b/config/rootfiles/core/163/filelists/files
index d8baf418f0ecfcda362367e61d150376da990e50..c3d53e9d26120fcd31c3fee54076e3517f96ac12 100644 (file)
--- a/config/rootfiles/core/163/filelists/files
+++ b/config/rootfiles/core/163/filelists/files
@@ -1,6 +1,11 @@
 etc/dracut.conf
+lib/udev/network-aqm
+lib/udev/network-hotplug-bridges
+lib/udev/rules.d/99-aqm.rules
+srv/web/ipfire/cgi-bin/qos.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 srv/web/ipfire/html/themes/ipfire/include/functions.pl
 var/ipfire/backup/bin/backup.pl
 var/ipfire/dhcp/advoptions-list
+var/ipfire/qos/bin/makeqosscripts.pl

diff --git a/config/rootfiles/core/163/update.sh b/config/rootfiles/core/163/update.sh
index f0bc7fb55bed64811c12c52f06b9435cea49a714..5b35ed4df20fd56a27359e6b1dfbd15222a3f32b 100644 (file)
--- a/config/rootfiles/core/163/update.sh
+++ b/config/rootfiles/core/163/update.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2021 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2022 IPFire-Team <info@ipfire.org>.                        #
 #                                                                          #
 ############################################################################
 #
@@ -56,9 +56,12 @@ rm -vrf \
        /lib/firmware/cxgb4/t4fw-1.25.4.0.bin \
        /lib/firmware/cxgb4/t5fw-1.25.4.0.bin \
        /lib/firmware/cxgb4/t6fw-1.25.4.0.bin \
-       /lib/firmware/intel/ice/ddp/ice-1.3.16.0.pkg
+       /lib/firmware/intel/ice/ddp/ice-1.3.16.0.pkg \
+       /lib/udev/enable_codel \
+       /lib/udev/rules.d/99-codel.rules
 
 # Stop services
+/usr/local/bin/qosctrl stop
 
 # Extract files
 extract_files
@@ -77,6 +80,8 @@ telinit u
 /etc/init.d/apache restart
 /etc/init.d/unbound restart
 /etc/init.d/squid restart
+/usr/local/bin/qosctrl generate
+/usr/local/bin/qosctrl start
 
 # rebuild initrd
 dracut --force --early-microcode --strip --verbose --xz