core158: Fix any potentially broken file permissions

[ipfire-2.x.git] / config / rootfiles / core / 158 / update.sh

diff --git a/config/rootfiles/core/158/update.sh b/config/rootfiles/core/158/update.sh
index 68fe116a995f5c5a8723a8aba14dfd759ef7ddaa..d02b49188d0ab63ee84f10e6961a6586f4fc6712 100644 (file)
--- a/config/rootfiles/core/158/update.sh
+++ b/config/rootfiles/core/158/update.sh
@@ -36,15 +36,44 @@ rm -vrf \
        /etc/rc.d/init.d/upnpd \
        /etc/rc.d/init.d/networking/red.down/10-miniupnpd \
        /etc/rc.d/init.d/networking/red.up/10-miniupnpd \
+       /usr/lib/conntrack-tools \
        /usr/lib/libixml.so.* \
        /usr/lib/libupnp.so.* \
-       /var/ipfire/upnp
+       /usr/lib/pppd/2.4.9/ \
+       /var/ipfire/upnp \
+       /lib/firmware/cxgb4/t4fw-1.24.14.0.bin \
+       /lib/firmware/cxgb4/t5fw-1.24.14.0.bin \
+       /lib/firmware/cxgb4/t6fw-1.24.14.0.bin \
+       /lib/firmware/intel/ice/ddp/ice-1.3.4.0.pkg
 
 # Stop services
 
+# Remove dropped packages
+for package in asterisk libsrtp motion libmicrohttpd sane fbset miniupnpd \
+               sendEmail libupnp lcd4linux dpfhack; do
+        if [ -e "/opt/pakfire/db/installed/meta-${package}" ]; then
+               stop_service "${package}"
+               for i in $(</opt/pakfire/db/rootfiles/${package}); do
+                       rm -rfv "/${i}"
+               done
+        fi
+        rm -f "/opt/pakfire/db/installed/meta-${package}"
+        rm -f "/opt/pakfire/db/meta/meta-${package}"
+        rm -f "/opt/pakfire/db/rootfiles/${package}"
+done
+
 # Extract files
 extract_files
 
+# Fix permissions just in case they broke again
+chmod -v 755 \
+       /usr \
+       /usr/bin \
+       /usr/lib \
+       /usr/sbin \
+       /var \
+       /var/ipfire
+
 # update linker config
 ldconfig
 
@@ -54,8 +83,16 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
 # Start services
-/etc/init.d/vnstatd restart
+/etc/init.d/vnstat restart
+/etc/init.d/rngd restart
+
+# Restart apache
+/etc/init.d/apache stop
+/etc/init.d/apache start
 
 # This update needs a reboot...
 #touch /var/run/need_reboot