installer: Simplify kernel command line parsing

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index b55bbdb857f00a01536fe05b5c603f073f2d8ea2..a91b2da7cf7061be2a8aadb10dbe1ee87db8bf60 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.15"                                                 # Version number
-CORE="82"                                                      # Core Level (Filename)
-PAKFIRE_CORE="81"                                              # Core Level (PAKFIRE)
+CORE="85"                                                      # Core Level (Filename)
+PAKFIRE_CORE="85"                                              # 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
@@ -401,6 +401,7 @@ buildipfire() {
   ipfiremake dracut
   ipfiremake lvm2
   ipfiremake multipath-tools
+  ipfiremake freetype
   ipfiremake grub
 
   case "${TARGET_ARCH}" in
@@ -488,7 +489,6 @@ buildipfire() {
   ipfiremake libpng
   ipfiremake libtiff
   ipfiremake libart
-  ipfiremake freetype
   ipfiremake gd
   ipfiremake popt
   ipfiremake pcre
@@ -862,6 +862,7 @@ buildpackages() {
   modprobe loop 2>/dev/null
   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then
        ipfiremake flash-images
+       ipfiremake flash-images SCON=1
   fi
 
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1