]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge branch 'aarch64' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 Jul 2018 10:52:05 +0000 (11:52 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 3 Jul 2018 10:52:05 +0000 (11:52 +0100)
Conflicts:
config/rootfiles/core/121/filelists/acpid
config/rootfiles/core/121/filelists/apache2
config/rootfiles/core/121/filelists/apr
config/rootfiles/core/121/filelists/aprutil
config/rootfiles/core/121/filelists/armv5tel/files
config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood
config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi
config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood
config/rootfiles/core/121/filelists/armv5tel/linux-multi
config/rootfiles/core/121/filelists/armv5tel/rpi-firmware
config/rootfiles/core/121/filelists/armv5tel/u-boot
config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood
config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage
config/rootfiles/core/121/filelists/beep
config/rootfiles/core/121/filelists/cmake
config/rootfiles/core/121/filelists/crda
config/rootfiles/core/121/filelists/dhcp
config/rootfiles/core/121/filelists/flex
config/rootfiles/core/121/filelists/i586/grub
config/rootfiles/core/121/filelists/i586/intel-microcode
config/rootfiles/core/121/filelists/i586/linux
config/rootfiles/core/121/filelists/i586/linux-initrd
config/rootfiles/core/121/filelists/iw
config/rootfiles/core/121/filelists/jwhois
config/rootfiles/core/121/filelists/libidn
config/rootfiles/core/121/filelists/multipath-tools
config/rootfiles/core/121/filelists/pcre
config/rootfiles/core/121/filelists/tar
config/rootfiles/core/121/filelists/unbound
config/rootfiles/core/121/filelists/wget
config/rootfiles/core/121/filelists/x86_64/grub
config/rootfiles/core/121/filelists/x86_64/intel-microcode
config/rootfiles/core/121/filelists/x86_64/linux
config/rootfiles/core/121/filelists/x86_64/linux-initrd
config/rootfiles/core/122/filelists/aarch64/files
config/rootfiles/core/122/filelists/acpid
config/rootfiles/core/122/filelists/apache2
config/rootfiles/core/122/filelists/apr
config/rootfiles/core/122/filelists/aprutil
config/rootfiles/core/122/filelists/armv5tel/linux-initrd-kirkwood
config/rootfiles/core/122/filelists/armv5tel/linux-initrd-multi
config/rootfiles/core/122/filelists/armv5tel/linux-kirkwood
config/rootfiles/core/122/filelists/armv5tel/linux-multi
config/rootfiles/core/122/filelists/armv5tel/rpi-firmware
config/rootfiles/core/122/filelists/armv5tel/u-boot
config/rootfiles/core/122/filelists/armv5tel/u-boot-kirkwood
config/rootfiles/core/122/filelists/armv5tel/u-boot-mkimage
config/rootfiles/core/122/filelists/beep
config/rootfiles/core/122/filelists/cmake
config/rootfiles/core/122/filelists/crda
config/rootfiles/core/122/filelists/dhcp
config/rootfiles/core/122/filelists/flex
config/rootfiles/core/122/filelists/i586/grub
config/rootfiles/core/122/filelists/i586/intel-microcode
config/rootfiles/core/122/filelists/i586/linux
config/rootfiles/core/122/filelists/i586/linux-initrd
config/rootfiles/core/122/filelists/iw
config/rootfiles/core/122/filelists/jwhois
config/rootfiles/core/122/filelists/libidn
config/rootfiles/core/122/filelists/multipath-tools
config/rootfiles/core/122/filelists/pcre
config/rootfiles/core/122/filelists/tar
config/rootfiles/core/122/filelists/unbound
config/rootfiles/core/122/filelists/wget
config/rootfiles/core/122/filelists/x86_64/grub
config/rootfiles/core/122/filelists/x86_64/intel-microcode
config/rootfiles/core/122/filelists/x86_64/linux
config/rootfiles/core/122/filelists/x86_64/linux-initrd
config/rootfiles/core/123/filelists/unbound
config/rootfiles/oldcore/121/filelists/acpid
config/rootfiles/oldcore/121/filelists/apache2
config/rootfiles/oldcore/121/filelists/apr
config/rootfiles/oldcore/121/filelists/aprutil
config/rootfiles/oldcore/121/filelists/armv5tel/files
config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-kirkwood
config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-multi
config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-rpi
config/rootfiles/oldcore/121/filelists/armv5tel/linux-kirkwood
config/rootfiles/oldcore/121/filelists/armv5tel/linux-multi
config/rootfiles/oldcore/121/filelists/armv5tel/linux-rpi
config/rootfiles/oldcore/121/filelists/armv5tel/rpi-firmware
config/rootfiles/oldcore/121/filelists/armv5tel/u-boot
config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-kirkwood
config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-mkimage
config/rootfiles/oldcore/121/filelists/beep
config/rootfiles/oldcore/121/filelists/cmake
config/rootfiles/oldcore/121/filelists/crda
config/rootfiles/oldcore/121/filelists/dhcp
config/rootfiles/oldcore/121/filelists/flex
config/rootfiles/oldcore/121/filelists/i586/grub
config/rootfiles/oldcore/121/filelists/i586/intel-microcode
config/rootfiles/oldcore/121/filelists/i586/linux
config/rootfiles/oldcore/121/filelists/i586/linux-initrd
config/rootfiles/oldcore/121/filelists/iw
config/rootfiles/oldcore/121/filelists/jwhois
config/rootfiles/oldcore/121/filelists/libidn
config/rootfiles/oldcore/121/filelists/multipath-tools
config/rootfiles/oldcore/121/filelists/pcre
config/rootfiles/oldcore/121/filelists/tar
config/rootfiles/oldcore/121/filelists/wget
config/rootfiles/oldcore/121/filelists/x86_64/grub
config/rootfiles/oldcore/121/filelists/x86_64/intel-microcode
config/rootfiles/oldcore/121/filelists/x86_64/linux
config/rootfiles/oldcore/121/filelists/x86_64/linux-initrd
make.sh

48 files changed:
1  2 
config/rootfiles/common/aarch64/initscripts
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/i586/initscripts
config/rootfiles/common/x86_64/initscripts
config/rootfiles/core/123/update.sh
config/rootfiles/oldcore/121/filelists/files
config/rootfiles/oldcore/121/update.sh
config/rootfiles/oldcore/122/exclude
config/rootfiles/oldcore/122/filelists/acpid
config/rootfiles/oldcore/122/filelists/apache2
config/rootfiles/oldcore/122/filelists/apr
config/rootfiles/oldcore/122/filelists/aprutil
config/rootfiles/oldcore/122/filelists/armv5tel/files
config/rootfiles/oldcore/122/filelists/armv5tel/linux-initrd-kirkwood
config/rootfiles/oldcore/122/filelists/armv5tel/linux-initrd-multi
config/rootfiles/oldcore/122/filelists/armv5tel/linux-kirkwood
config/rootfiles/oldcore/122/filelists/armv5tel/linux-multi
config/rootfiles/oldcore/122/filelists/armv5tel/rpi-firmware
config/rootfiles/oldcore/122/filelists/armv5tel/u-boot
config/rootfiles/oldcore/122/filelists/armv5tel/u-boot-kirkwood
config/rootfiles/oldcore/122/filelists/armv5tel/u-boot-mkimage
config/rootfiles/oldcore/122/filelists/beep
config/rootfiles/oldcore/122/filelists/cmake
config/rootfiles/oldcore/122/filelists/crda
config/rootfiles/oldcore/122/filelists/dhcp
config/rootfiles/oldcore/122/filelists/files
config/rootfiles/oldcore/122/filelists/flex
config/rootfiles/oldcore/122/filelists/i586/grub
config/rootfiles/oldcore/122/filelists/i586/intel-microcode
config/rootfiles/oldcore/122/filelists/i586/linux
config/rootfiles/oldcore/122/filelists/i586/linux-initrd
config/rootfiles/oldcore/122/filelists/iw
config/rootfiles/oldcore/122/filelists/jwhois
config/rootfiles/oldcore/122/filelists/libidn
config/rootfiles/oldcore/122/filelists/multipath-tools
config/rootfiles/oldcore/122/filelists/pcre
config/rootfiles/oldcore/122/filelists/tar
config/rootfiles/oldcore/122/filelists/unbound
config/rootfiles/oldcore/122/filelists/wget
config/rootfiles/oldcore/122/filelists/x86_64/grub
config/rootfiles/oldcore/122/filelists/x86_64/intel-microcode
config/rootfiles/oldcore/122/filelists/x86_64/linux
config/rootfiles/oldcore/122/filelists/x86_64/linux-initrd
config/rootfiles/oldcore/122/filelists/xtables-addons
config/rootfiles/oldcore/122/meta
config/rootfiles/oldcore/122/update.sh
lfs/initscripts
make.sh

index 3cb05d95f2dd5278c88ec79e3d0c53a874feb64d,97ba5ad65fb0a950e15203bd0c2bbd69a5c1839a..66a7be55b8518610d2a560d8b8425b973b742755
@@@ -1,12 -1,10 +1,12 @@@
  etc/init.d
  #etc/rc.d
  #etc/rc.d/helper
 +etc/rc.d/helper/aws-setup
  etc/rc.d/helper/getdnsfromdhcpc.pl
  #etc/rc.d/init.d
  etc/rc.d/init.d/acpid
  etc/rc.d/init.d/apache
 +etc/rc.d/init.d/aws
  etc/rc.d/init.d/beep
  etc/rc.d/init.d/checkfs
  etc/rc.d/init.d/cleanfs
@@@ -119,6 -117,7 +119,7 @@@ etc/rc.d/rc0.d/S80mountf
  etc/rc.d/rc0.d/S90swap
  etc/rc.d/rc0.d/S99halt
  #etc/rc.d/rc3.d
+ etc/rc.d/rc3.d/S00random
  etc/rc.d/rc3.d/S01vnstat
  etc/rc.d/rc3.d/S10sysklogd
  etc/rc.d/rc3.d/S11unbound
@@@ -132,7 -131,6 +133,6 @@@ etc/rc.d/rc3.d/S19wlanclien
  etc/rc.d/rc3.d/S20network
  etc/rc.d/rc3.d/S21leds
  etc/rc.d/rc3.d/S24cyrus-sasl
- etc/rc.d/rc3.d/S25random
  etc/rc.d/rc3.d/S30sshd
  etc/rc.d/rc3.d/S32apache
  etc/rc.d/rc3.d/S40fcron
@@@ -186,7 -184,6 +186,7 @@@ etc/rc.d/rcsysinit.d/S50cleanf
  etc/rc.d/rcsysinit.d/S60setclock
  etc/rc.d/rcsysinit.d/S70console
  etc/rc.d/rcsysinit.d/S73swconfig
 +etc/rc.d/rcsysinit.d/S74aws
  etc/rc.d/rcsysinit.d/S75firstsetup
  etc/rc.d/rcsysinit.d/S80localnet
  etc/rc.d/rcsysinit.d/S81pakfire
index 3cb05d95f2dd5278c88ec79e3d0c53a874feb64d,97ba5ad65fb0a950e15203bd0c2bbd69a5c1839a..66a7be55b8518610d2a560d8b8425b973b742755
@@@ -1,12 -1,10 +1,12 @@@
  etc/init.d
  #etc/rc.d
  #etc/rc.d/helper
 +etc/rc.d/helper/aws-setup
  etc/rc.d/helper/getdnsfromdhcpc.pl
  #etc/rc.d/init.d
  etc/rc.d/init.d/acpid
  etc/rc.d/init.d/apache
 +etc/rc.d/init.d/aws
  etc/rc.d/init.d/beep
  etc/rc.d/init.d/checkfs
  etc/rc.d/init.d/cleanfs
@@@ -119,6 -117,7 +119,7 @@@ etc/rc.d/rc0.d/S80mountf
  etc/rc.d/rc0.d/S90swap
  etc/rc.d/rc0.d/S99halt
  #etc/rc.d/rc3.d
+ etc/rc.d/rc3.d/S00random
  etc/rc.d/rc3.d/S01vnstat
  etc/rc.d/rc3.d/S10sysklogd
  etc/rc.d/rc3.d/S11unbound
@@@ -132,7 -131,6 +133,6 @@@ etc/rc.d/rc3.d/S19wlanclien
  etc/rc.d/rc3.d/S20network
  etc/rc.d/rc3.d/S21leds
  etc/rc.d/rc3.d/S24cyrus-sasl
- etc/rc.d/rc3.d/S25random
  etc/rc.d/rc3.d/S30sshd
  etc/rc.d/rc3.d/S32apache
  etc/rc.d/rc3.d/S40fcron
@@@ -186,7 -184,6 +186,7 @@@ etc/rc.d/rcsysinit.d/S50cleanf
  etc/rc.d/rcsysinit.d/S60setclock
  etc/rc.d/rcsysinit.d/S70console
  etc/rc.d/rcsysinit.d/S73swconfig
 +etc/rc.d/rcsysinit.d/S74aws
  etc/rc.d/rcsysinit.d/S75firstsetup
  etc/rc.d/rcsysinit.d/S80localnet
  etc/rc.d/rcsysinit.d/S81pakfire
index 2c230697543ab181a9eccd5ced48c3f864cd01fb,ab8d4f1080f2528845e9a282ebf16d692a78fb3e..8f3d41476d502f9ce5bdcb9d4d64b5022c706e43
@@@ -1,12 -1,10 +1,12 @@@
  etc/init.d
  #etc/rc.d
  #etc/rc.d/helper
 +etc/rc.d/helper/aws-setup
  etc/rc.d/helper/getdnsfromdhcpc.pl
  #etc/rc.d/init.d
  etc/rc.d/init.d/acpid
  etc/rc.d/init.d/apache
 +etc/rc.d/init.d/aws
  etc/rc.d/init.d/beep
  etc/rc.d/init.d/checkfs
  etc/rc.d/init.d/cleanfs
@@@ -118,6 -116,7 +118,7 @@@ etc/rc.d/rc0.d/S80mountf
  etc/rc.d/rc0.d/S90swap
  etc/rc.d/rc0.d/S99halt
  #etc/rc.d/rc3.d
+ etc/rc.d/rc3.d/S00random
  etc/rc.d/rc3.d/S01vnstat
  etc/rc.d/rc3.d/S10sysklogd
  etc/rc.d/rc3.d/S12acpid
@@@ -131,7 -130,6 +132,6 @@@ etc/rc.d/rc3.d/S20networ
  etc/rc.d/rc3.d/S11unbound
  etc/rc.d/rc3.d/S21leds
  etc/rc.d/rc3.d/S24cyrus-sasl
- etc/rc.d/rc3.d/S25random
  etc/rc.d/rc3.d/S30sshd
  etc/rc.d/rc3.d/S32apache
  etc/rc.d/rc3.d/S40fcron
@@@ -184,7 -182,6 +184,7 @@@ etc/rc.d/rcsysinit.d/S45udev_retr
  etc/rc.d/rcsysinit.d/S50cleanfs
  etc/rc.d/rcsysinit.d/S60setclock
  etc/rc.d/rcsysinit.d/S70console
 +etc/rc.d/rcsysinit.d/S74aws
  etc/rc.d/rcsysinit.d/S75firstsetup
  etc/rc.d/rcsysinit.d/S80localnet
  etc/rc.d/rcsysinit.d/S81pakfire
index 2c230697543ab181a9eccd5ced48c3f864cd01fb,ab8d4f1080f2528845e9a282ebf16d692a78fb3e..8f3d41476d502f9ce5bdcb9d4d64b5022c706e43
@@@ -1,12 -1,10 +1,12 @@@
  etc/init.d
  #etc/rc.d
  #etc/rc.d/helper
 +etc/rc.d/helper/aws-setup
  etc/rc.d/helper/getdnsfromdhcpc.pl
  #etc/rc.d/init.d
  etc/rc.d/init.d/acpid
  etc/rc.d/init.d/apache
 +etc/rc.d/init.d/aws
  etc/rc.d/init.d/beep
  etc/rc.d/init.d/checkfs
  etc/rc.d/init.d/cleanfs
@@@ -118,6 -116,7 +118,7 @@@ etc/rc.d/rc0.d/S80mountf
  etc/rc.d/rc0.d/S90swap
  etc/rc.d/rc0.d/S99halt
  #etc/rc.d/rc3.d
+ etc/rc.d/rc3.d/S00random
  etc/rc.d/rc3.d/S01vnstat
  etc/rc.d/rc3.d/S10sysklogd
  etc/rc.d/rc3.d/S12acpid
@@@ -131,7 -130,6 +132,6 @@@ etc/rc.d/rc3.d/S20networ
  etc/rc.d/rc3.d/S11unbound
  etc/rc.d/rc3.d/S21leds
  etc/rc.d/rc3.d/S24cyrus-sasl
- etc/rc.d/rc3.d/S25random
  etc/rc.d/rc3.d/S30sshd
  etc/rc.d/rc3.d/S32apache
  etc/rc.d/rc3.d/S40fcron
@@@ -184,7 -182,6 +184,7 @@@ etc/rc.d/rcsysinit.d/S45udev_retr
  etc/rc.d/rcsysinit.d/S50cleanfs
  etc/rc.d/rcsysinit.d/S60setclock
  etc/rc.d/rcsysinit.d/S70console
 +etc/rc.d/rcsysinit.d/S74aws
  etc/rc.d/rcsysinit.d/S75firstsetup
  etc/rc.d/rcsysinit.d/S80localnet
  etc/rc.d/rcsysinit.d/S81pakfire
index 1e9b1d1937c3f52404a09675cfc1c2369dd7c6c6,0000000000000000000000000000000000000000..ee8a5ec0b7f05dbdd4b830d003877d42828eaabf
mode 100644,000000..100644
--- /dev/null
@@@ -1,63 -1,0 +1,67 @@@
 +#!/bin/bash
 +############################################################################
 +#                                                                          #
 +# This file is part of the IPFire Firewall.                                #
 +#                                                                          #
 +# IPFire is free software; you can redistribute it and/or modify           #
 +# it under the terms of the GNU General Public License as published by     #
 +# the Free Software Foundation; either version 3 of the License, or        #
 +# (at your option) any later version.                                      #
 +#                                                                          #
 +# IPFire is distributed in the hope that it will be useful,                #
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
 +# GNU General Public License for more details.                             #
 +#                                                                          #
 +# You should have received a copy of the GNU General Public License        #
 +# along with IPFire; if not, write to the Free Software                    #
 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 +#                                                                          #
 +# Copyright (C) 2017 IPFire-Team <info@ipfire.org>.                        #
 +#                                                                          #
 +############################################################################
 +#
 +. /opt/pakfire/lib/functions.sh
 +/usr/local/bin/backupctrl exclude >/dev/null 2>&1
 +
 +core=123
 +
 +# Remove old core updates from pakfire cache to save space...
 +for (( i=1; i<=$core; i++ )); do
 +      rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 +done
 +
 +# Stop services
 +
 +# Extract files
 +extract_files
 +
++# move exec random initskript earlier
++mv /etc/rc.d/rc3.d/S??random /etc/rc.d/rc3.d/S00random
++
 +# update linker config
 +ldconfig
 +
 +# Update Language cache
 +/usr/local/bin/update-lang-cache
 +
 +# Start services
 +/etc/init.d/unbound restart
 +
 +# This update needs a reboot...
 +touch /var/run/need_reboot
 +
 +# Finish
 +/etc/init.d/fireinfo start
 +sendprofile
 +
 +# Update grub config to display new core version
 +if [ -e /boot/grub/grub.cfg ]; then
 +      grub-mkconfig -o /boot/grub/grub.cfg
 +fi
 +
 +sync
 +
 +# Don't report the exitcode last command
 +exit 0
++
index a0bb9423cfc746c77c2d055c34163e5d84c0a20a,e15417ea60dfeb02479504fb74c4a4ad4b719dfc..e15417ea60dfeb02479504fb74c4a4ad4b719dfc
@@@ -1,20 -1,6 +1,6 @@@
  etc/system-release
  etc/issue
- etc/rc.d/init.d/acpid
- etc/rc.d/init.d/collectd
- etc/rc.d/init.d/firstsetup
- etc/rc.d/init.d/leds
- etc/rc.d/init.d/partresize
  etc/rc.d/init.d/rngd
- etc/rc.d/rc0.d/K87acpid
- etc/rc.d/rc3.d/S12acpid
- etc/rc.d/rc6.d/K87acpid
  etc/ssl/certs/ca-bundle.crt
- srv/web/ipfire/cgi-bin/entropy.cgi
- srv/web/ipfire/cgi-bin/firewall.cgi
- srv/web/ipfire/cgi-bin/fwhosts.cgi
- srv/web/ipfire/cgi-bin/ovpnmain.cgi
- srv/web/ipfire/cgi-bin/remote.cgi
- usr/lib/firewall/firewall-lib.pl
- var/ipfire/langs
- var/ipfire/qos/bin/makeqosscripts.pl
+ opt/pakfire/etc/pakfire.conf
+ usr/sbin/setup
index 76994d9226498405d7041e0a6d966f9671cf26d9,18019c1d7957bc475619157dd9289fdb78638edd..18019c1d7957bc475619157dd9289fdb78638edd
@@@ -29,6 -29,8 +29,8 @@@ core=12
  exit_with_error() {
        # Set last succesfull installed core.
        echo $(($core-1)) > /opt/pakfire/db/core/mine
+       # don't start pakfire again at error
+       killall -KILL pak_update
        /usr/bin/logger -p syslog.emerg -t ipfire \
                "core-update-${core}: $1"
        exit $2
@@@ -39,13 -41,6 +41,6 @@@ for (( i=1; i<=$core; i++ )); d
        rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
  done
  
- # This update cannot be applied on ARM
- case "$(uname -a)" in
-       arm*)
-               exit_with_error "ERROR: Cannot update on ARM. Please re-install." 1
-               ;;
- esac
  # Do some sanity checks.
  case $(uname -r) in
        *-ipfire*)
@@@ -59,23 -54,11 +54,11 @@@ esa
  # Check diskspace on root
  ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
  
- if [ $ROOTSPACE -lt 100000 ]; then
+ if [ $ROOTSPACE -lt 220000 ]; then
        exit_with_error "ERROR cannot update because not enough free space on root." 2
        exit 2
  fi
  
- # Remove the old kernel
- rm -rf /boot/System.map-*
- rm -rf /boot/config-*
- rm -rf /boot/ipfirerd-*
- rm -rf /boot/initramfs-*
- rm -rf /boot/vmlinuz-*
- rm -rf /boot/uImage-ipfire-*
- rm -rf /boot/zImage-ipfire-*
- rm -rf /boot/uInit-ipfire-*
- rm -rf /boot/dtb-*-ipfire-*
- rm -rf /lib/modules
  # Stop services
  
  # Extract files
@@@ -85,27 -68,12 +68,12 @@@ extract_file
  ldconfig
  
  # Update Language cache
- /usr/local/bin/update-lang-cache
- # Remove Nagios files, if any...
- rm -rvf \
-       /etc/rc.d/init.d/nagios \
-       /usr/bin/nagios \
-       /etc/rc.d/rc6.d/K33nagios \
-       /etc/rc.d/rc3.d/off/S67nagios \
-       /etc/rc.d/rc0.d/K33nagios \
-       /etc/httpd/conf/conf.d/nagios.conf \
-       /etc/nagios/nagios.cfg \
-       /usr/bin/p1.pl \
-       /usr/bin/nagiostats \
-       /usr/share/nagios/ \
-       /var/nagios/
  
  # Start services
  /etc/init.d/apache restart
  
  # This update needs a reboot...
- touch /var/run/need_reboot
#touch /var/run/need_reboot
  
  # Finish
  /etc/init.d/fireinfo start
@@@ -116,7 -84,32 +84,32 @@@ if [ -e /boot/grub/grub.cfg ]; the
        grub-mkconfig -o /boot/grub/grub.cfg
  fi
  
+ #
+ # After pakfire has ended run it again and update the lists and do upgrade
+ #
+ echo '#!/bin/bash'                                        >  /tmp/pak_update
+ echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
+ echo '    sleep 1'                                        >> /tmp/pak_update
+ echo 'done'                                               >> /tmp/pak_update
+ echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do'   >> /tmp/pak_update
+ echo '    sleep 1'                                        >> /tmp/pak_update
+ echo 'done'                                               >> /tmp/pak_update
+ echo '/opt/pakfire/pakfire update -y --force'             >> /tmp/pak_update
+ echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/pak_update
+ echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/pak_update
+ echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/pak_update
+ echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update
+ echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update
+ echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update
+ echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
+ #
+ killall -KILL pak_update
+ chmod +x /tmp/pak_update
+ /tmp/pak_update &
  sync
  
  # Don't report the exitcode last command
  exit 0
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d6fd053b6eb6108a7776ec908ba20f3ccae5347f
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,30 @@@
++boot/config.txt
++boot/grub/grub.cfg
++boot/grub/grubenv
++etc/alternatives
++etc/collectd.custom
++etc/default/grub
++etc/ipsec.conf
++etc/ipsec.secrets
++etc/ipsec.user.conf
++etc/ipsec.user.secrets
++etc/localtime
++etc/shadow
++etc/snort/snort.conf
++etc/ssh/ssh_config
++etc/ssh/sshd_config
++etc/ssl/openssl.cnf
++etc/sudoers
++etc/sysconfig/firewall.local
++etc/sysconfig/rc.local
++etc/udev/rules.d/30-persistent-network.rules
++srv/web/ipfire/html/proxy.pac
++var/ipfire/dma
++var/ipfire/time
++var/ipfire/ovpn
++var/lib/alternatives
++var/log/cache
++var/log/dhcpcd.log
++var/log/messages
++var/state/dhcp/dhcpd.leases
++var/updatecache
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..73f1b7b0d976a3b26b4eb332ede90a6674f20b41
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/acpid
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..eef95efa7298bf4772946054bc7e73985f8f5cbf
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/apache2
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..87dd1974f2dcc9bb4a5f068e6811fa97c2679f75
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/apr
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..999f9f84bc4c1153d5655ef602ed952b46e98cb7
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/aprutil
index 0000000000000000000000000000000000000000,d2712ba533e5e8bd733fb01bbdaf865e75feaf41..d2712ba533e5e8bd733fb01bbdaf865e75feaf41
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,1 +1,1 @@@
+ etc/rc.d/init.d/swconfig
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..39c5591b7163e4a98c143f4aeda1df507f5a295a
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/linux-initrd-kirkwood
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0b1b4530a84e72769f3c9372b53bf53779ada334
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/linux-initrd-multi
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..72171071e6eaa99abe646f1fbe6e16096e0ee97d
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/linux-kirkwood
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..204eb4c437e85a878d7bc0be00a770db44219b39
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/linux-multi
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..428fdf88fefba8c62ba66ba63890a9522e248ba2
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/rpi-firmware
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..3df31a883d6686b2aa8df5788a54f4aa87bd179a
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/u-boot
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..eebbdb14a89ffa62d1274126976270f2bc2cea86
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/u-boot-kirkwood
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..65fe960aead734639c476ab9ddc7f868d47c6e01
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/armv5tel/u-boot-mkimage
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..6db094efa700f771d54f08d7e8a8b813e1ce77e6
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/beep
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..491d25f727ca1055c3f1a038b0743540e47e2ade
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/cmake
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d68c46e55b16a8e4bf93eaf066a47af70aa7f561
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/crda
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..32d8da443dc96a791394dc5a2e978c4908586192
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/dhcp
index 0000000000000000000000000000000000000000,d87145961edc0b59a4050d9a245c4afc922d3947..d87145961edc0b59a4050d9a245c4afc922d3947
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,19 +1,19 @@@
+ etc/system-release
+ etc/issue
+ etc/rc.d/init.d/acpid
+ etc/rc.d/init.d/collectd
+ etc/rc.d/init.d/firstsetup
+ etc/rc.d/init.d/leds
+ etc/rc.d/init.d/partresize
+ etc/rc.d/init.d/random
+ etc/rc.d/rc0.d/K87acpid
+ etc/rc.d/rc3.d/S12acpid
+ etc/rc.d/rc6.d/K87acpid
+ srv/web/ipfire/cgi-bin/entropy.cgi
+ srv/web/ipfire/cgi-bin/firewall.cgi
+ srv/web/ipfire/cgi-bin/fwhosts.cgi
+ srv/web/ipfire/cgi-bin/ovpnmain.cgi
+ srv/web/ipfire/cgi-bin/remote.cgi
+ usr/lib/firewall/firewall-lib.pl
+ var/ipfire/langs
+ var/ipfire/qos/bin/makeqosscripts.pl
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..feb0390ffef9c448f9adeaa53a2e9815c22a76a4
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/flex
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..feb236a22403463643570f8c9d6e8bf1f29980d1
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/i586/grub
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..f03e84778a19c63c5755cf29400c17fd503719c6
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/i586/intel-microcode
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..693ec4bbf9b5812b1eb469704861dfd92bac1450
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/i586/linux
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..32a03e6a905bbb3947f92a31d20ee242f15dd2db
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/i586/linux-initrd
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..7c58a2089aa48875fc503eb559f54212da44ab87
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/iw
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b984a7f3f63abb5afaf3095b6a0768e50033c515
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/jwhois
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..7e35489571e2a4c026be2c6534b090531cc90f43
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/libidn
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..9ff63237c5d642ec4450301171a2da953095018d
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/multipath-tools
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b390d9a367aec8304b9133902958e277d5481380
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/pcre
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..3e585d2ebea80fb18e885bb492401c4a977f716c
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/tar
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..66adf092425150267d45d8378f8e0316a161de9e
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/unbound
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..fcb57dfec80be999cd45ddd214463ed3debf86d0
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/wget
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..78d3bd78400d86b5df863ea06a7de5b65e3a78de
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/x86_64/grub
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d5ac074e2eee75bd7f0860ede7b07e76d746cc04
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/x86_64/intel-microcode
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0615b5b9ad53f8af33b76b63e087941e7b64c36c
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/x86_64/linux
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..1b9fff70ff1b7694940bb7ee65d8da704a0fd0d2
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,1 @@@
++../../../../common/x86_64/linux-initrd
index 0000000000000000000000000000000000000000,2e24c4298bf0cc1f403ce5e52014319d3a86fb63..2e24c4298bf0cc1f403ce5e52014319d3a86fb63
mode 000000,120000..120000
--- /dev/null
@@@ -1,0 -1,1 +1,1 @@@
+ ../../../common/xtables-addons
index 0000000000000000000000000000000000000000,d547fa86fa8487654281f4d5309d6733f66a323c..d547fa86fa8487654281f4d5309d6733f66a323c
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,1 +1,1 @@@
+ DEPS=""
index 0000000000000000000000000000000000000000,bb38696c40069ed3410f6555d6577f1bedca6a68..bb38696c40069ed3410f6555d6577f1bedca6a68
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,162 +1,162 @@@
+ #!/bin/bash
+ ############################################################################
+ #                                                                          #
+ # This file is part of the IPFire Firewall.                                #
+ #                                                                          #
+ # IPFire is free software; you can redistribute it and/or modify           #
+ # it under the terms of the GNU General Public License as published by     #
+ # the Free Software Foundation; either version 3 of the License, or        #
+ # (at your option) any later version.                                      #
+ #                                                                          #
+ # IPFire is distributed in the hope that it will be useful,                #
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+ # GNU General Public License for more details.                             #
+ #                                                                          #
+ # You should have received a copy of the GNU General Public License        #
+ # along with IPFire; if not, write to the Free Software                    #
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+ #                                                                          #
+ # Copyright (C) 2018 IPFire-Team <info@ipfire.org>.                        #
+ #                                                                          #
+ ############################################################################
+ #
+ . /opt/pakfire/lib/functions.sh
+ /usr/local/bin/backupctrl exclude >/dev/null 2>&1
+ core=122
+ exit_with_error() {
+       # Set last succesfull installed core.
+       echo $(($core-1)) > /opt/pakfire/db/core/mine
+       # don't start pakfire again at error
+       killall -KILL pak_update
+       /usr/bin/logger -p syslog.emerg -t ipfire \
+               "core-update-${core}: $1"
+       exit $2
+ }
+ # Remove old core updates from pakfire cache to save space...
+ for (( i=1; i<=$core; i++ )); do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+ done
+ KVER="xxxKVERxxx"
+ # Backup uEnv.txt if exist
+ if [ -e /boot/uEnv.txt ]; then
+       cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+ fi
+ # Do some sanity checks.
+ case $(uname -r) in
+       *-ipfire*)
+               # Ok.
+               ;;
+       *)
+               exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+               ;;
+ esac
+ # Check diskspace on root
+ ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+ if [ $ROOTSPACE -lt 80000 ]; then
+       exit_with_error "ERROR cannot update because not enough free space on root." 2
+       exit 2
+ fi
+ # Remove the old kernel
+ rm -rf /boot/System.map-*
+ rm -rf /boot/config-*
+ rm -rf /boot/ipfirerd-*
+ rm -rf /boot/initramfs-*
+ rm -rf /boot/vmlinuz-*
+ rm -rf /boot/uImage-ipfire-*
+ rm -rf /boot/zImage-ipfire-*
+ rm -rf /boot/uInit-ipfire-*
+ rm -rf /boot/dtb-*-ipfire-*
+ rm -rf /lib/modules
+ rm -f  /etc/sysconfig/lm_sensors
+ # Stop services
+ # Extract files
+ extract_files
+ # update linker config
+ ldconfig
+ # Update Language cache
+ /usr/local/bin/update-lang-cache
+ # Remove Nagios files, if any...
+ rm -rvf \
+       /etc/rc.d/init.d/nagios \
+       /usr/bin/nagios \
+       /etc/rc.d/rc6.d/K33nagios \
+       /etc/rc.d/rc3.d/off/S67nagios \
+       /etc/rc.d/rc0.d/K33nagios \
+       /etc/httpd/conf/conf.d/nagios.conf \
+       /etc/nagios/nagios.cfg \
+       /usr/bin/p1.pl \
+       /usr/bin/nagiostats \
+       /usr/share/nagios/ \
+       /var/nagios/
+ # Start services
+ /etc/init.d/apache restart
+ # Upadate Kernel version uEnv.txt
+ if [ -e /boot/uEnv.txt ]; then
+       sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
+ fi
+ # call user update script (needed for some arm boards)
+ if [ -e /boot/pakfire-kernel-update ]; then
+       /boot/pakfire-kernel-update ${KVER}
+ fi
+ mv /etc/rc.d/rc3.d/S??random /etc/rc.d/rc3.d/S00random
+ case "$(uname -m)" in
+       i?86)
+               # Force (re)install pae kernel if pae is supported
+               rm -rf /opt/pakfire/db/installed/meta-linux-pae
+               if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+                       ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+                       BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+                       if [ $BOOTSPACE -lt 22000 -o $ROOTSPACE -lt 120000 ]; then
+                               /usr/bin/logger -p syslog.emerg -t ipfire \
+                               "core-update-${core}: WARNING not enough space for pae kernel."
+                       else
+                               echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
+                               echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+                               echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
+                       fi
+               fi
+               ;;
+ esac
+ # This update needs a reboot...
+ #touch /var/run/need_reboot
+ # Finish
+ /etc/init.d/fireinfo start
+ sendprofile
+ # Install new grub and update config
+ if [ -e /boot/grub/grub.cfg ]; then
+       /usr/local/bin/update-bootloader
+ fi
+ sync
+ # Reload microcode
+ modprobe microcode
+ if [ -w "/sys/devices/system/cpu/microcode/reload" ]; then
+       echo 1 > /sys/devices/system/cpu/microcode/reload
+ fi
+ # Don't report the exitcode last command
+ exit 0
diff --combined lfs/initscripts
index 9b611a2765bc2e323e7be680f58049bbfe5c80fc,848540680aa43c27bad907ad62c437e9f007e0d6..1058779f11a4ed167be7210b7f50f7422f1a025c
@@@ -1,7 -1,7 +1,7 @@@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
- # Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+ # Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@@ -16,7 -16,6 +16,6 @@@
  # You should have received a copy of the GNU General Public License           #
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
  #                                                                             #
- ###############################################################################
  
  ###############################################################################
  # Definitions
@@@ -131,7 -130,7 +130,7 @@@ $(TARGET) 
        ln -sf ../init.d/unbound     /etc/rc.d/rc3.d/S11unbound
        ln -sf ../init.d/unbound     /etc/rc.d/rc6.d/K79unbound
        ln -sf ../init.d/random      /etc/rc.d/rc0.d/K45random
-       ln -sf ../init.d/random      /etc/rc.d/rc3.d/S25random
+       ln -sf ../init.d/random      /etc/rc.d/rc3.d/S00random
        ln -sf ../init.d/random      /etc/rc.d/rc6.d/K45random
        ln -sf ../../sysconfig/rc.local /etc/rc.d/rc3.d/S98rc.local
        ln -sf ../init.d/client175   /etc/rc.d/rc0.d/K34client175
        ln -sf ../init.d/setclock    /etc/rc.d/rc0.d/K47setclock
        ln -sf ../init.d/setclock    /etc/rc.d/rc6.d/K47setclock
        ln -sf ../init.d/console     /etc/rc.d/rcsysinit.d/S70console
 +      ln -sf ../init.d/aws         /etc/rc.d/rcsysinit.d/S74aws
        ln -sf ../init.d/firstsetup  /etc/rc.d/rcsysinit.d/S75firstsetup
        ln -sf ../init.d/localnet    /etc/rc.d/rcsysinit.d/S80localnet
        ln -sf ../init.d/pakfire     /etc/rc.d/rcsysinit.d/S81pakfire
diff --combined make.sh
index 948bc6ed3af97dd39eb8a38e799ffa4cb7501e2f,89b83b3ab227a54977065f77a2cf18b64f7206cd..cfb06fcd0e44ec5703f40d4910c2acf71bd58ef3
+++ b/make.sh
@@@ -25,7 -25,7 +25,7 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.21"                                                        # Version number
 -CORE="122"                                                    # Core Level (Filename)
 +CORE="123"                                                    # Core Level (Filename)
  PAKFIRE_CORE="122"                                            # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
@@@ -1137,6 -1137,17 +1137,17 @@@ buildipfire() 
  #             lfsmake2 backports                      KCFG="-multi"
  #             lfsmake2 e1000e                 KCFG="-multi"
  #             lfsmake2 igb                            KCFG="-multi"
+ #             lfsmake2 ixgbe                  KCFG="-multi"
+               lfsmake2 xtables-addons         KCFG="-multi"
+               lfsmake2 linux-initrd                   KCFG="-multi"
+               ;;
+       aarch64)
+               # arm multi platform (RPi3, OrangePi PC2 ...) kernel build
+               lfsmake2 linux                  KCFG="-multi"
+ #             lfsmake2 backports                      KCFG="-multi"
+ #             lfsmake2 e1000e                 KCFG="-multi"
+ #             lfsmake2 igb                            KCFG="-multi"
  #             lfsmake2 ixgbe                  KCFG="-multi"
                lfsmake2 xtables-addons         KCFG="-multi"
                lfsmake2 linux-initrd                   KCFG="-multi"
    lfsmake2 mc
    lfsmake2 wget
    lfsmake2 bridge-utils
- #  lfsmake2 screen
    lfsmake2 smartmontools
    lfsmake2 htop
    lfsmake2 chkconfig
    lfsmake2 iftop
    lfsmake2 mdns-repeater
    lfsmake2 i2c-tools
 +  lfsmake2 nss-myhostname
  }
  
  buildinstaller() {