Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit

Conflicts:
	config/etc/logrotate.conf

diff --combined config/rootfiles/common/armv5tel/initscripts
index c761e2667234bd209602194014a2cf5e13e670f4,980441599ec703d158feed8e74cbddf3b5c33077..e529e6644f92b9be10dc7d1a30b1304bbd6957bc
mode 100755,100644..100755
--- 1/config/rootfiles/common/armv5tel/initscripts
--- 2/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@@ -44,7 -44,6 +44,6 @@@ etc/rc.d/init.d/ipse
  etc/rc.d/init.d/leds
  etc/rc.d/init.d/localnet
  etc/rc.d/init.d/mISDN
- #etc/rc.d/init.d/mdadm
  #etc/rc.d/init.d/mediatomb
  #etc/rc.d/init.d/messagebus
  #etc/rc.d/init.d/miau
@@@ -53,9 -52,9 +52,10 @@@
  #etc/rc.d/init.d/mldonkey
  etc/rc.d/init.d/modules
  #etc/rc.d/init.d/motion
 +#etc/rc.d/init.d/monit
  etc/rc.d/init.d/mountfs
  etc/rc.d/init.d/mountkernfs
+ etc/rc.d/init.d/mounttmpfs
  #etc/rc.d/init.d/mpd
  #etc/rc.d/init.d/mysql
  #etc/rc.d/init.d/netsnmpd
@@@ -215,8 -214,11 +215,11 @@@ etc/rc.d/rcsysinit.d/S05module
  etc/rc.d/rcsysinit.d/S10udev
  etc/rc.d/rcsysinit.d/S19waitdrives
  etc/rc.d/rcsysinit.d/S20swap
+ etc/rc.d/rcsysinit.d/S25partresize
  etc/rc.d/rcsysinit.d/S30checkfs
  etc/rc.d/rcsysinit.d/S40mountfs
+ etc/rc.d/rcsysinit.d/S42fsresize
+ etc/rc.d/rcsysinit.d/S43mounttmpfs
  etc/rc.d/rcsysinit.d/S45udev_retry
  etc/rc.d/rcsysinit.d/S50cleanfs
  etc/rc.d/rcsysinit.d/S60setclock

diff --combined config/rootfiles/common/i586/initscripts
index 525c55c455af95534d87963da0e307178cddcbe9,d0bc8c5c20dfc0dfe53ceaaec6ab33fc9da60ee6..58b67c88fb2e8d0ab91c67d42e9448c1d41d53ef
mode 100755,100644..100755
--- 1/config/rootfiles/common/i586/initscripts
--- 2/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@@ -46,7 -46,6 +46,6 @@@ etc/rc.d/init.d/ipse
  etc/rc.d/init.d/leds
  etc/rc.d/init.d/localnet
  etc/rc.d/init.d/mISDN
- #etc/rc.d/init.d/mdadm
  #etc/rc.d/init.d/mediatomb
  #etc/rc.d/init.d/messagebus
  #etc/rc.d/init.d/miau
@@@ -54,10 -53,10 +53,11 @@@
  #etc/rc.d/init.d/miniupnpd
  #etc/rc.d/init.d/mldonkey
  etc/rc.d/init.d/modules
 +#etc/rc.d/init.d/monit
  #etc/rc.d/init.d/motion
  etc/rc.d/init.d/mountfs
  etc/rc.d/init.d/mountkernfs
+ etc/rc.d/init.d/mounttmpfs
  #etc/rc.d/init.d/mpd
  #etc/rc.d/init.d/mysql
  #etc/rc.d/init.d/netsnmpd
@@@ -222,8 -221,11 +222,11 @@@ etc/rc.d/rcsysinit.d/S10ude
  etc/rc.d/rcsysinit.d/S19checkfstab
  etc/rc.d/rcsysinit.d/S19waitdrives
  etc/rc.d/rcsysinit.d/S20swap
+ etc/rc.d/rcsysinit.d/S25partresize
  etc/rc.d/rcsysinit.d/S30checkfs
  etc/rc.d/rcsysinit.d/S40mountfs
+ etc/rc.d/rcsysinit.d/S42fsresize
+ etc/rc.d/rcsysinit.d/S43mounttmpfs
  etc/rc.d/rcsysinit.d/S45udev_retry
  etc/rc.d/rcsysinit.d/S50cleanfs
  etc/rc.d/rcsysinit.d/S60setclock

diff --combined lfs/initscripts
index 4acf65e13eb965ae8673e0a40e72786a30d3a5c9,4894710ac371923dc6c0921723e69593fbb9f726..4894710ac371923dc6c0921723e69593fbb9f726
mode 100755,100644..100755
--- 1/lfs/initscripts
--- 2/lfs/initscripts
+++ b/lfs/initscripts
@@@ -162,8 -162,11 +162,11 @@@ $(TARGET) 
        ln -sf ../init.d/udev        /etc/rc.d/rcsysinit.d/S10udev
        ln -sf ../init.d/waitdrives  /etc/rc.d/rcsysinit.d/S19waitdrives
        ln -sf ../init.d/swap        /etc/rc.d/rcsysinit.d/S20swap
+       ln -sf ../init.d/partresize  /etc/rc.d/rcsysinit.d/S25partresize
        ln -sf ../init.d/checkfs     /etc/rc.d/rcsysinit.d/S30checkfs
        ln -sf ../init.d/mountfs     /etc/rc.d/rcsysinit.d/S40mountfs
+       ln -sf ../init.d/fsresize    /etc/rc.d/rcsysinit.d/S42fsresize
+       ln -sf ../init.d/mounttmpfs  /etc/rc.d/rcsysinit.d/S43mounttmpfs
        ln -sf ../init.d/udev_retry  /etc/rc.d/rcsysinit.d/S45udev_retry
        ln -sf ../init.d/cleanfs     /etc/rc.d/rcsysinit.d/S50cleanfs
        ln -sf ../init.d/setclock    /etc/rc.d/rcsysinit.d/S60setclock

diff --combined make.sh
index e1f54c7d94e85589606763580bd35b405748bada,575380dbe12547248f29a3423016b8ad19330783..5183940c9efa6622ff63d650d13833e886ea72f0
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
- VERSION="2.15"                                                        # Version number
- CORE="85"                                                     # Core Level (Filename)
- PAKFIRE_CORE="85"                                             # Core Level (PAKFIRE)
+ VERSION="2.17"                                                        # Version number
+ CORE="87"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="86"                                             # 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
@@@ -36,7 -36,7 +36,7 @@@ BUILD_IMAGES=1                                                        # Flash and Xen Do
  KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
  GIT_TAG=$(git tag | tail -1)                                  # Git Tag
  GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)        # Last commit
- TOOLCHAINVER=7
+ TOOLCHAINVER=8
  
  # New architecture variables
  BUILD_ARCH="$(uname -m)"
@@@ -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,61 -396,54 +396,54 @@@
    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)
                # x86-pae (Native and new XEN) kernel build
                ipfiremake linux                        KCFG="-pae"
- #             ipfiremake kvm-kmod                     KCFG="-pae"
- #             ipfiremake v4l-dvb                      KCFG="-pae"
- #             ipfiremake mISDN                        KCFG="-pae"
                ipfiremake cryptodev                    KCFG="-pae"
- #             ipfiremake compat-drivers               KCFG="-pae"
- #             ipfiremake r8169                        KCFG="-pae"
- #             ipfiremake r8168                        KCFG="-pae"
- #             ipfiremake r8101                        KCFG="-pae"
                ipfiremake e1000e                       KCFG="-pae"
                ipfiremake igb                          KCFG="-pae"
+               ipfiremake ixgbe                        KCFG="-pae"
+               ipfiremake linux-initrd                 KCFG="-pae"
  
                # x86 kernel build
                ipfiremake linux                        KCFG=""
- #             ipfiremake kvm-kmod                     KCFG=""
- #             ipfiremake v4l-dvb                      KCFG=""
- #             ipfiremake mISDN                        KCFG=""
                ipfiremake cryptodev                    KCFG=""
- #             ipfiremake compat-drivers               KCFG=""
- #             ipfiremake r8169                        KCFG=""
- #             ipfiremake r8168                        KCFG=""
- #             ipfiremake r8101                        KCFG=""
                ipfiremake e1000e                       KCFG=""
                ipfiremake igb                          KCFG=""
+               ipfiremake ixgbe                        KCFG=""
+               ipfiremake linux-initrd                 KCFG=""
                ;;
  
        armv5tel)
                # arm-rpi (Raspberry Pi) kernel build
                ipfiremake linux                        KCFG="-rpi"
- #             ipfiremake v4l-dvb                      KCFG="-rpi"
- #             ipfiremake mISDN                        KCFG="-rpi" NOPCI=1
                ipfiremake cryptodev                    KCFG="-rpi"
- #             ipfiremake compat-drivers               KCFG="-rpi"
+               ipfiremake linux-initrd                 KCFG="-rpi"
  
                # arm multi platform (Panda, Wandboard ...) kernel build
                ipfiremake linux                        KCFG="-multi"
                ipfiremake cryptodev                    KCFG="-multi"
                ipfiremake e1000e                       KCFG="-multi"
                ipfiremake igb                          KCFG="-multi"
+               ipfiremake ixgbe                        KCFG="-multi"
+               ipfiremake linux-initrd                 KCFG="-multi"
  
                # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
                ipfiremake linux                        KCFG="-kirkwood"
- #             ipfiremake v4l-dvb                      KCFG="-kirkwood"
- #             ipfiremake mISDN                        KCFG="-kirkwood"
                ipfiremake cryptodev                    KCFG="-kirkwood"
- #             ipfiremake compat-drivers               KCFG="-kirkwood"
- #             ipfiremake r8169                        KCFG="-kirkwood"
- #             ipfiremake r8168                        KCFG="-kirkwood"
- #             ipfiremake r8101                        KCFG="-kirkwood"
- #             ipfiremake e1000e                       KCFG="-kirkwood"
+               ipfiremake e1000e                       KCFG="-kirkwood"
                ipfiremake igb                          KCFG="-kirkwood"
+               ipfiremake ixgbe                        KCFG="-kirkwood"
+               ipfiremake linux-initrd                 KCFG="-kirkwood"
                ;;
    esac
    ipfiremake pkg-config
@@@ -466,8 -457,6 +457,6 @@@
    ipfiremake dhcpcd
    ipfiremake boost
    ipfiremake linux-atm
-   ipfiremake cpio
-   ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
    ipfiremake pam
@@@ -486,12 -475,12 +475,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
@@@ -739,7 -728,6 +728,7 @@@
    ipfiremake iftop
    ipfiremake motion
    ipfiremake joe
 +  ipfiremake monit
    ipfiremake nut
    ipfiremake watchdog
    ipfiremake libpri
@@@ -749,7 -737,6 +738,6 @@@
    ipfiremake usb_modeswitch
    ipfiremake usb_modeswitch_data
    ipfiremake zerofree
-   ipfiremake mdadm
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
@@@ -816,6 -803,8 +804,8 @@@
    ipfiremake batctl
    ipfiremake perl-PDF-API2
    ipfiremake squid-accounting
+   ipfiremake pigz
+   ipfiremake tmux
  }
  
  buildinstaller() {
@@@ -825,7 -814,6 +815,6 @@@
    ipfiremake memtest
    ipfiremake installer
    installmake strip
-   ipfiremake initrd
  }
  
  buildpackages() {
@@@ -862,6 -850,7 +851,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