Merge branch 'master' into next

This commit is contained in:
Michael Tremer
2014-09-26 12:21:18 +02:00
2 changed files with 4 additions and 1 deletions

View File

@@ -38,6 +38,9 @@ done
# Extract files
extract_files
# reload init because glibc/linker changed
telinit -u
# Start services
# Update Language cache

View File

@@ -26,7 +26,7 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.15" # Version number
CORE="83" # Core Level (Filename)
PAKFIRE_CORE="82" # Core Level (PAKFIRE)
PAKFIRE_CORE="83" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir