Merge branch 'master' into next

diff --combined config/rootfiles/oldcore/149/update.sh
index 50add169b4df06630e0e1d4da1353cddeb6ec810,38f80529f48a6b78e5576e3fe53ef86c33d9af98..38f80529f48a6b78e5576e3fe53ef86c33d9af98
--- 1/config/rootfiles/oldcore/149/update.sh
--- 2/config/rootfiles/core/149/update.sh
+++ b/config/rootfiles/oldcore/149/update.sh
@@@ -43,6 -43,9 +43,9 @@@ extract_file
  # update linker config
  ldconfig
  
+ # Restart init to allow clean unmout at reboot
+ telinit u
+ 
  # Update Language cache
  /usr/local/bin/update-lang-cache
  

diff --combined make.sh
index 4a9dd3cb66129db3d9d85f6071992645efa879d8,ab90e5143353e30ab40afa51fa203aea323d2445..33c5de5cdb285ae1097bc2b8582bb09d260f6fdd
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -26,7 -26,7 +26,7 @@@ NAME="IPFire"                                                 # Software nam
  SNAME="ipfire"                                                        # Short name
  # If you update the version don't forget to update backupiso and add it to core update
  VERSION="2.25"                                                        # Version number
 -CORE="149"                                                    # Core Level (Filename)
 +CORE="150"                                                    # Core Level (Filename)
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
  NICE=10                                                               # Nice level
@@@ -39,7 -39,7 +39,7 @@@ GIT_BRANCH="$(git rev-parse --abbrev-re
  GIT_TAG="$(git tag | tail -1)"                                        # Git Tag
  GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)"                       # Last commit
  
- TOOLCHAINVER=20200814
+ TOOLCHAINVER=20200924
  
  ###############################################################################
  #
@@@ -153,7 -153,7 +153,7 @@@ configure_build() 
                        BUILDTARGET="${build_arch}-pc-linux-gnu"
                        CROSSTARGET="${build_arch}-cross-linux-gnu"
                        BUILD_PLATFORM="x86"
-                       CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer -fcf-protection"
+                       CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
                        ;;
  
                aarch64)