Merge branch 'master' into next

[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 44464725b4bc4dc7dd95da5c79f77905cfe0e937..1a1ad44a982609972899455c6c4abac4554d2cfa 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,6 +47,7 @@ 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* \
@@ -79,6 +86,13 @@ ldconfig
 # Apply local configuration to sshd_config
 /usr/local/bin/sshctrl
 
+# Apply sysctl changes
+/etc/init.d/sysctl start
+
+# Fix permissions of /etc/sudoers.d/
+chmod -v 750 /etc/sudoers.d
+chmod -v 640 /etc/sudoers.d/*
+
 # Start services
 /etc/init.d/sshd restart
 /etc/init.d/vnstatd restart
@@ -88,7 +102,7 @@ ldconfig
 /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