From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 1 Jun 2012 15:30:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/core60' into next
X-Git-Tag: v2.11-core61^2~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a832f4f33ef12cd4245b5d50bc98b05db2dae2ca;p=people%2Fms%2Fipfire-2.x.git

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

Conflicts:
	config/rootfiles/core/59/update.sh
	lfs/strongswan
	make.sh
---

a832f4f33ef12cd4245b5d50bc98b05db2dae2ca
diff --cc config/rootfiles/core/59/update.sh
index 5a3cc2a213,6764f1c20c..2f1d865a8e
--- a/config/rootfiles/core/59/update.sh
+++ b/config/rootfiles/core/59/update.sh
@@@ -37,6 -39,6 +39,7 @@@ don
  
  #
  #Extract files
++extract_files
  
  #
  #Start services
diff --cc make.sh
index f3e3065c4e,6b1c93d313..89f979d95b
--- a/make.sh
+++ b/make.sh
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
  VERSION="2.11"							# Version number
--CORE="60"							# Core Level (Filename)
- PAKFIRE_CORE="59"						# Core Level (PAKFIRE)
++CORE="61"							# Core Level (Filename)
+ PAKFIRE_CORE="60"						# Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
  SLOGAN="www.ipfire.org"						# Software slogan
  CONFIG_ROOT=/var/ipfire						# Configuration rootdir