Merge remote-tracking branch 'origin/core60' into next

Conflicts:
	config/rootfiles/core/59/update.sh
	lfs/strongswan
	make.sh
This commit is contained in:
Arne Fitzenreiter
2012-06-01 17:30:54 +02:00
8 changed files with 107 additions and 4 deletions

View File

@@ -34,12 +34,16 @@ done
#
#Stop services
/etc/init.d/ipsec stop
/etc/init.d/sshd stop
#
#Extract files
extract_files
#
#Start services
/etc/init.d/sshd start
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
/etc/init.d/ipsec start
fi