Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

This commit is contained in:
Christian Schmidt
2010-04-11 19:45:04 +02:00
3 changed files with 11 additions and 0 deletions

View File

@@ -0,0 +1 @@
../../../common/squid

View File

@@ -0,0 +1 @@
../../../common/squidguard

View File

@@ -65,6 +65,11 @@ rm -rf /lib/modules/*-ipfire
# Todo: remove openswan libs ...
#
#
# Stop Sevices
#
/etc/init.d/squid stop
#
# Backup grub.conf
#
@@ -133,6 +138,10 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
# Todo convert ipsec.conf from open to strongswan...
#
#
# Start Sevices
#
/etc/init.d/squid start
#
# Delete old lm-sensor modullist...
#
rm -rf /etc/sysconfig/lm_sensors