Merge branch 'install-raid' into seventeen

Conflicts:
	make.sh

diff --combined doc/language_missings
index 83c242fc3322422af57a2430a4345bbd34c89e40,a511ad2d6f56eb373359750dc90a7ed7ba7e9ba9..bf928516cae1460c165c9defd30ce5b1756ebba7
--- 1/doc/language_missings
--- 2/doc/language_missings
+++ b/doc/language_missings
@@@ -1,16 -1,10 +1,10 @@@
  ############################################################################
- # Checking install/setup translations for language: en                     #
- ############################################################################
- ############################################################################
  # Checking cgi-bin translations for language: en                           #
  ############################################################################
  < addon
  < ccd maxclients
  < ovpn_fragment
  ############################################################################
- # Checking install/setup translations for language: fr                     #
- ############################################################################
- ############################################################################
  # Checking cgi-bin translations for language: fr                           #
  ############################################################################
  < addon
@@@ -159,14 -153,12 +153,14 @@@
  < fwdfw dnat porterr2
  < fwdfw DROP
  < fwdfw edit
 +< fwdfw err concon
  < fwdfw err nosrc
  < fwdfw err nosrcip
  < fwdfw err notgt
  < fwdfw err notgtip
  < fwdfw err prot_port
  < fwdfw err prot_port1
 +< fwdfw err ratecon
  < fwdfw err remark
  < fwdfw err ruleexists
  < fwdfw err same
@@@ -185,12 -177,10 +179,12 @@@
  < fwdfw hint mac
  < fwdfw iface
  < fwdfw ipsec network
 +< fwdfw limitconcon
  < fwdfw log
  < fwdfw log rule
  < fwdfw man port
  < fwdfw many
 +< fwdfw maxconcon
  < fwdfw menu
  < fwdfw MODE1
  < fwdfw MODE2
@@@ -198,7 -188,6 +192,7 @@@
  < fwdfw moveup
  < fwdfw natport used
  < fwdfw newrule
 +< fwdfw numcon
  < fwdfw p2p txt
  < fwdfw pol allow
  < fwdfw pol block
@@@ -207,7 -196,6 +201,7 @@@
  < fwdfw pol title
  < fwdfw prot41
  < fwdfw prot41 short
 +< fwdfw ratelimit
  < fwdfw red
  < fwdfw REJECT
  < fwdfw reread
@@@ -562,9 -550,6 +556,6 @@@
  < wlan client wpa mode ccmp tkip
  < wlan client wpa mode tkip tkip
  ############################################################################
- # Checking install/setup translations for language: es                     #
- ############################################################################
- ############################################################################
  # Checking cgi-bin translations for language: es                           #
  ############################################################################
  < addon
@@@ -713,14 -698,12 +704,14 @@@
  < fwdfw dnat porterr2
  < fwdfw DROP
  < fwdfw edit
 +< fwdfw err concon
  < fwdfw err nosrc
  < fwdfw err nosrcip
  < fwdfw err notgt
  < fwdfw err notgtip
  < fwdfw err prot_port
  < fwdfw err prot_port1
 +< fwdfw err ratecon
  < fwdfw err remark
  < fwdfw err ruleexists
  < fwdfw err same
@@@ -739,12 -722,10 +730,12 @@@
  < fwdfw hint mac
  < fwdfw iface
  < fwdfw ipsec network
 +< fwdfw limitconcon
  < fwdfw log
  < fwdfw log rule
  < fwdfw man port
  < fwdfw many
 +< fwdfw maxconcon
  < fwdfw menu
  < fwdfw MODE1
  < fwdfw MODE2
@@@ -752,7 -733,6 +743,7 @@@
  < fwdfw moveup
  < fwdfw natport used
  < fwdfw newrule
 +< fwdfw numcon
  < fwdfw p2p txt
  < fwdfw pol allow
  < fwdfw pol block
@@@ -761,7 -741,6 +752,7 @@@
  < fwdfw pol title
  < fwdfw prot41
  < fwdfw prot41 short
 +< fwdfw ratelimit
  < fwdfw red
  < fwdfw REJECT
  < fwdfw reread
@@@ -1109,9 -1088,6 +1100,6 @@@
  < wlan client wpa mode ccmp tkip
  < wlan client wpa mode tkip tkip
  ############################################################################
- # Checking install/setup translations for language: pl                     #
- ############################################################################
- ############################################################################
  # Checking cgi-bin translations for language: pl                           #
  ############################################################################
  < addon
@@@ -1251,14 -1227,12 +1239,14 @@@
  < fwdfw dnat porterr2
  < fwdfw DROP
  < fwdfw edit
 +< fwdfw err concon
  < fwdfw err nosrc
  < fwdfw err nosrcip
  < fwdfw err notgt
  < fwdfw err notgtip
  < fwdfw err prot_port
  < fwdfw err prot_port1
 +< fwdfw err ratecon
  < fwdfw err remark
  < fwdfw err ruleexists
  < fwdfw err same
@@@ -1277,12 -1251,10 +1265,12 @@@
  < fwdfw hint mac
  < fwdfw iface
  < fwdfw ipsec network
 +< fwdfw limitconcon
  < fwdfw log
  < fwdfw log rule
  < fwdfw man port
  < fwdfw many
 +< fwdfw maxconcon
  < fwdfw menu
  < fwdfw MODE1
  < fwdfw MODE2
@@@ -1290,7 -1262,6 +1278,7 @@@
  < fwdfw moveup
  < fwdfw natport used
  < fwdfw newrule
 +< fwdfw numcon
  < fwdfw p2p txt
  < fwdfw pol allow
  < fwdfw pol block
@@@ -1299,7 -1270,6 +1287,7 @@@
  < fwdfw pol title
  < fwdfw prot41
  < fwdfw prot41 short
 +< fwdfw ratelimit
  < fwdfw red
  < fwdfw REJECT
  < fwdfw reread
@@@ -1631,9 -1601,6 +1619,6 @@@
  < wlan client wpa mode ccmp tkip
  < wlan client wpa mode tkip tkip
  ############################################################################
- # Checking install/setup translations for language: ru                     #
- ############################################################################
- ############################################################################
  # Checking cgi-bin translations for language: ru                           #
  ############################################################################
  < Add a route
@@@ -1778,14 -1745,12 +1763,14 @@@
  < fwdfw dnat porterr2
  < fwdfw DROP
  < fwdfw edit
 +< fwdfw err concon
  < fwdfw err nosrc
  < fwdfw err nosrcip
  < fwdfw err notgt
  < fwdfw err notgtip
  < fwdfw err prot_port
  < fwdfw err prot_port1
 +< fwdfw err ratecon
  < fwdfw err remark
  < fwdfw err ruleexists
  < fwdfw err same
@@@ -1804,12 -1769,10 +1789,12 @@@
  < fwdfw hint mac
  < fwdfw iface
  < fwdfw ipsec network
 +< fwdfw limitconcon
  < fwdfw log
  < fwdfw log rule
  < fwdfw man port
  < fwdfw many
 +< fwdfw maxconcon
  < fwdfw menu
  < fwdfw MODE1
  < fwdfw MODE2
@@@ -1817,7 -1780,6 +1802,7 @@@
  < fwdfw moveup
  < fwdfw natport used
  < fwdfw newrule
 +< fwdfw numcon
  < fwdfw p2p txt
  < fwdfw pol allow
  < fwdfw pol block
@@@ -1826,7 -1788,6 +1811,7 @@@
  < fwdfw pol title
  < fwdfw prot41
  < fwdfw prot41 short
 +< fwdfw ratelimit
  < fwdfw red
  < fwdfw REJECT
  < fwdfw reread

diff --combined make.sh
index d94271163627cefe7ecad616d467c353a751b0e4,ac8d50583c3b75d963f341067a7f02c3d1e2c80b..8a7aafdd420972a4bc7296fdd55781ca402b6786
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,7 -25,7 +25,7 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.15"                                                        # Version number
 -CORE="84"                                                     # Core Level (Filename)
 +CORE="85"                                                     # 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
@@@ -362,7 -362,6 +362,6 @@@ buildbase() 
      lfsmake2 less
      lfsmake2 make
      lfsmake2 man
-     lfsmake2 mktemp
      lfsmake2 kmod
      lfsmake2 net-tools
      lfsmake2 patch
@@@ -377,7 -376,6 +376,6 @@@
      lfsmake2 vim
      lfsmake2 xz
      lfsmake2 paxctl
-     lfsmake2 grub
  }
  
  buildipfire() {
@@@ -398,6 -396,13 +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)
@@@ -466,8 -471,6 +471,6 @@@
    ipfiremake dhcpcd
    ipfiremake boost
    ipfiremake linux-atm
-   ipfiremake cpio
-   ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
    ipfiremake pam
@@@ -486,12 -489,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
@@@ -747,7 -750,6 +750,6 @@@
    ipfiremake usb_modeswitch
    ipfiremake usb_modeswitch_data
    ipfiremake zerofree
-   ipfiremake mdadm
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
@@@ -814,6 -816,7 +816,7 @@@
    ipfiremake batctl
    ipfiremake perl-PDF-API2
    ipfiremake squid-accounting
+   ipfiremake pigz
  }
  
  buildinstaller() {
@@@ -823,7 -826,6 +826,6 @@@
    ipfiremake memtest
    ipfiremake installer
    installmake strip
-   ipfiremake initrd
  }
  
  buildpackages() {
@@@ -860,6 -862,7 +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