Merge remote-tracking branch 'origin/core60' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 1 Jun 2012 15:30:54 +0000 (17:30 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 1 Jun 2012 15:30:54 +0000 (17:30 +0200)
Conflicts:
config/rootfiles/core/59/update.sh
lfs/strongswan
make.sh

1  2 
config/rootfiles/core/59/update.sh
make.sh

index 5a3cc2a213eae6275b5fa310f11026c1a900be1f,6764f1c20ca82e044c99d66dc1ab78c337e9f6ad..2f1d865a8e9eea3f90cb2cdda08cd39045659a11
@@@ -37,6 -39,6 +39,7 @@@ don
  
  #
  #Extract files
++extract_files
  
  #
  #Start services
diff --cc make.sh
index f3e3065c4eb5c00119ceb4596176e48776558a83,6b1c93d313c264907d0f4ff4825bfd9dc33ead1c..89f979d95b7ec36b8112595900c89a10640b44ef
+++ 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