Core Update 168: Ship and apply sysctl changes

[people/mfischer/ipfire-2.x.git] / config / rootfiles / core / 168 / update.sh

diff --git a/config/rootfiles/core/168/update.sh b/config/rootfiles/core/168/update.sh
index d938fbef806347e2c6fbb768c81d1845f07ee2a1..7e3ff07c27ca84df38ca5ea8d8d7dc98b240583f 100644 (file)
--- a/config/rootfiles/core/168/update.sh
+++ b/config/rootfiles/core/168/update.sh
@@ -33,6 +33,12 @@ done
 
 # Remove files
 rm -rvf \
+       /lib/firmware/cxgb4/t4fw-1.26.4.0.bin \
+       /lib/firmware/cxgb4/t5fw-1.26.4.0.bin \
+       /lib/firmware/cxgb4/t6fw-1.26.4.0.bin \
+       /lib/firmware/intel/ice/ddp-comms/ice_comms-1.3.20.0.pkg \
+       /lib/firmware/silabs \
+       /lib/libprocps.so* \
        /usr/bin/dnet-config \
        /usr/bin/sdparm \
        /usr/lib/libart_lgpl_2.so* \
@@ -41,12 +47,29 @@ rm -rvf \
        /usr/lib/libevent-1.4.so* \
        /usr/lib/libevent_core-1.4.so* \
        /usr/lib/libevent_extra-1.4.so* \
+       /usr/lib/liblber-2.4.so* \
+       /usr/lib/libnl.so* \
        /usr/lib/libpri.so* \
        /usr/lib/libsolv.so* \
        /usr/lib/libsolvext.so* \
        /usr/sbin/dnet
 
+# Remove netbpm add-on, if installed
+if [ -e "/opt/pakfire/db/installed/meta-netbpm" ]; then
+       for i in $(</opt/pakfire/db/rootfiles/netbpm); do
+               rm -rfv "/${i}"
+       done
+fi
+rm -vf \
+       /opt/pakfire/db/installed/meta-netbpm \
+       /opt/pakfire/db/meta/meta-netbpm \
+       /opt/pakfire/db/rootfiles/netbpm
+
 # Stop services
+/etc/init.d/squid stop
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
+/etc/init.d/suricata stop
 
 # Extract files
 extract_files
@@ -60,10 +83,22 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
+# Apply sysctl changes
+/etc/init.d/sysctl start
+
 # Start services
+/etc/init.d/sshd restart
+/etc/init.d/vnstatd restart
+/etc/init.d/squid start
+/usr/local/bin/openvpnctrl -s
+/usr/local/bin/openvpnctrl -sn2n
+/etc/init.d/suricata start
 
 # This update needs a reboot...
-#touch /var/run/need_reboot
+touch /var/run/need_reboot
 
 # Finish
 /etc/init.d/fireinfo start