mv /var/ipfire/vpn/ipsec.conf /var/ipfire/vpn/ipsec.conf.org
grep -v "keyexchange=ikev1" /var/ipfire/vpn/ipsec.conf.org > /var/ipfire/vpn/ipsec.conf
sed -i "s|^conn [A-Za-z].*$|&\n\tkeyexchange=ikev1|g" /var/ipfire/vpn/ipsec.conf
+chown nobody:nobody /var/ipfire/vpn/ipsec.conf
#new squid has some changed options. Build a basic config to be able start squid.
mv /var/ipfire/proxy/squid.conf /var/ipfire/proxy/squid.conf.org
grep -v "header_access " /var/ipfire/proxy/squid.conf.org | \
grep -v "error_directory " | \
+grep -v "cache_dir null" | \
grep -v "reply_body_max_size 0" > /var/ipfire/proxy/squid.conf
echo >> /var/ipfire/proxy/squid.conf
echo error_directory /etc/squid/errors >> /var/ipfire/proxy/squid.conf
+chown nobody:nobody /var/ipfire/proxy/squid.conf
+
+#Convert extrahd entries to UUID
+cp -f /var/ipfire/extrahd/devices /var/ipfire/extrahd/devices.org
+while read entry
+do
+ device=`echo $entry | cut -f1 -d";"`
+ uuid=`blkid -c /dev/null -s UUID -o value /dev/$device`
+ if [ ! -z $uuid ]; then
+ sed -i -e "s|$device|UUID=$uuid|g" /var/ipfire/extrahd/devices
+ sed -i -e "s|/dev/$device|UUID=$uuid|g" /var/ipfire/extrahd/fstab
+ sed -i -e "s|/dev/$device|UUID=$uuid|g" /etc/fstab
+ fi
+done < /var/ipfire/extrahd/devices.org
#
# Start services
#
/etc/init.d/squid start
/etc/init.d/snort start
-/etc/init.d/ipsec start
-
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+ /etc/init.d/ipsec start
+fi
# Add pakfire and fireinfo cronjobs...
grep -v "# fireinfo" /var/spool/cron/root.orig |
sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /etc/fstab
fi
#
+# Don't show gpl on updated systens
+#
+touch /var/ipfire/main/gpl_accepted
+#
# ReInstall grub
#
grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck