glibc: fix image, updater and filecount in installer.

[people/teissler/ipfire-2.x.git] / config / rootfiles / core / 76 / update.sh

diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh
index 43c4c3f072c79bed3f5ae42f7fab82a44edd625b..db8271a87f058819e9bc45b8c1944f3395c42059 100644 (file)
--- a/config/rootfiles/core/76/update.sh
+++ b/config/rootfiles/core/76/update.sh
@@ -113,6 +113,7 @@ add_to_backup usr/share/usb_modeswitch
 add_to_backup etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
 add_to_backup etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
 add_to_backup usr/local/bin/dialctrl.pl
+add_to_backup usr/lib/locale/locale-archive
 
 # Backup the files
 tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \
@@ -143,6 +144,11 @@ rm -rf /lib/modules
 
 # Remove old usb_modeswitch_data
 rm -rf /usr/share/usb_modeswitch
+# Remove old tzdata
+rm -rf /usr/share/zoneinfo
+
+# Remoce old locale-archive
+rm -rf /usr/lib/locale/locale-archive
 
 # Remove dialctrl.pl script
 rm -f \
@@ -277,6 +283,7 @@ rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
 /sbin/iptables -N POLICYOUT 2>/dev/null
 /sbin/iptables -t nat -N NAT_SOURCE 2>/dev/null
 /sbin/iptables -t nat -N NAT_DESTINATION 2>/dev/null
+/sbin/iptables -t mangle -N NAT_DESTINATION 2>/dev/null
 
 # Create config files for firewall and fix permissions.
 touch /var/ipfire/firewall/config
@@ -289,6 +296,10 @@ touch /var/ipfire/fwhosts/customgroups
 touch /var/ipfire/fwhosts/customservices
 touch /var/ipfire/fwhosts/customservicegrp
 
+if [ ! -s "/var/ipfire/fwhosts/customservices" ];then
+       cp /var/ipfire/fwhosts/customservices.default /var/ipfire/fwhosts/customservices
+fi
+
 # Fix ownership.
 chown -R nobody:nobody /var/ipfire/firewall
 chown -R nobody:nobody /var/ipfire/fwhosts