Merge branch 'master' into install-raid

Conflicts:
	config/rootfiles/common/bash
	lfs/bash

diff --combined make.sh
index 8a2ecc6e1b5ab59d1e8a7f2b3f5504b8f0d79231,074f120dc1ac32c308bff9f3959f3b6390ad63ce..ac8d50583c3b75d963f341067a7f02c3d1e2c80b
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.15"                                                        # Version number
- CORE="82"                                                     # Core Level (Filename)
- PAKFIRE_CORE="82"                                             # Core Level (PAKFIRE)
+ CORE="84"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="84"                                             # 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
@@@ -362,6 -362,7 +362,6 @@@ buildbase() 
      lfsmake2 less
      lfsmake2 make
      lfsmake2 man
 -    lfsmake2 mktemp
      lfsmake2 kmod
      lfsmake2 net-tools
      lfsmake2 patch
@@@ -376,6 -377,7 +376,6 @@@
      lfsmake2 vim
      lfsmake2 xz
      lfsmake2 paxctl
 -    lfsmake2 grub
  }
  
  buildipfire() {
@@@ -396,13 -398,6 +396,13 @@@
    ipfiremake rpi-firmware
    ipfiremake bc
    ipfiremake u-boot
 +  ipfiremake cpio
 +  ipfiremake mdadm
 +  ipfiremake dracut
 +  ipfiremake lvm2
 +  ipfiremake multipath-tools
 +  ipfiremake freetype
 +  ipfiremake grub
  
    case "${TARGET_ARCH}" in
        i586)
@@@ -471,6 -466,8 +471,6 @@@
    ipfiremake dhcpcd
    ipfiremake boost
    ipfiremake linux-atm
 -  ipfiremake cpio
 -  ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
    ipfiremake pam
@@@ -489,12 -486,12 +489,12 @@@
    ipfiremake libpng
    ipfiremake libtiff
    ipfiremake libart
 -  ipfiremake freetype
    ipfiremake gd
    ipfiremake popt
    ipfiremake pcre
    ipfiremake slang
    ipfiremake newt
 +  ipfiremake libsmooth
    ipfiremake attr
    ipfiremake acl
    ipfiremake libcap
@@@ -750,6 -747,7 +750,6 @@@
    ipfiremake usb_modeswitch
    ipfiremake usb_modeswitch_data
    ipfiremake zerofree
 -  ipfiremake mdadm
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
@@@ -816,7 -814,6 +816,7 @@@
    ipfiremake batctl
    ipfiremake perl-PDF-API2
    ipfiremake squid-accounting
 +  ipfiremake pigz
  }
  
  buildinstaller() {
@@@ -826,6 -823,7 +826,6 @@@
    ipfiremake memtest
    ipfiremake installer
    installmake strip
 -  ipfiremake initrd
  }
  
  buildpackages() {
@@@ -862,7 -860,6 +862,7 @@@
    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