From eefe8acbeab5ab57c3bcba1e2089b3d755086c94 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 31 Aug 2020 07:06:41 +0200 Subject: [PATCH] core150: start core150 and add kernel Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/{149 => 150}/exclude | 0 .../core/150/filelists/aarch64/linux | 1 + .../core/150/filelists/aarch64/linux-initrd | 1 + .../150/filelists/armv5tel/linux-initrd-multi | 1 + .../core/150/filelists/armv5tel/linux-multi | 1 + config/rootfiles/core/150/filelists/files | 4 + .../rootfiles/core/150/filelists/i586/linux | 1 + .../core/150/filelists/i586/linux-initrd | 1 + .../rootfiles/core/150/filelists/x86_64/linux | 1 + .../core/150/filelists/x86_64/linux-initrd | 1 + config/rootfiles/core/150/update.sh | 136 ++++++++++++++++++ config/rootfiles/oldcore/149/exclude | 32 +++++ .../149/filelists/aarch64/gcc | 0 .../149/filelists/aarch64/glibc | 0 .../149/filelists/aarch64/gmp | 0 .../149/filelists/aarch64/grub | 0 .../{core => oldcore}/149/filelists/apache2 | 0 .../149/filelists/armv5tel/gcc | 0 .../149/filelists/armv5tel/glibc | 0 .../149/filelists/armv5tel/gmp | 0 .../{core => oldcore}/149/filelists/bind | 0 .../{core => oldcore}/149/filelists/curl | 0 .../{core => oldcore}/149/filelists/files | 0 .../{core => oldcore}/149/filelists/gnutls | 0 .../{core => oldcore}/149/filelists/gzip | 0 .../{core => oldcore}/149/filelists/i586/gcc | 0 .../149/filelists/i586/glibc | 0 .../{core => oldcore}/149/filelists/i586/gmp | 0 .../{core => oldcore}/149/filelists/i586/grub | 0 .../149/filelists/i586/hyperscan | 0 .../149/filelists/i586/intel-microcode | 0 .../149/filelists/i586/openssl-sse2 | 0 .../{core => oldcore}/149/filelists/iproute2 | 0 .../{core => oldcore}/149/filelists/kbd | 0 .../{core => oldcore}/149/filelists/libloc | 0 .../{core => oldcore}/149/filelists/logrotate | 0 .../{core => oldcore}/149/filelists/mpfr | 0 .../{core => oldcore}/149/filelists/openssl | 0 .../{core => oldcore}/149/filelists/perl | 0 .../{core => oldcore}/149/filelists/popt | 0 .../{core => oldcore}/149/filelists/squid | 0 .../149/filelists/strongswan | 0 .../{core => oldcore}/149/filelists/suricata | 0 .../{core => oldcore}/149/filelists/unbound | 0 .../{core => oldcore}/149/filelists/vim | 0 .../149/filelists/x86_64/gcc | 0 .../149/filelists/x86_64/glibc | 0 .../149/filelists/x86_64/gmp | 0 .../149/filelists/x86_64/grub | 0 .../149/filelists/x86_64/hyperscan | 0 .../149/filelists/x86_64/intel-microcode | 0 .../{core => oldcore}/149/filelists/xz | 0 .../{core => oldcore}/149/filelists/zstd | 0 .../rootfiles/{core => oldcore}/149/update.sh | 0 make.sh | 2 +- 55 files changed, 181 insertions(+), 1 deletion(-) rename config/rootfiles/core/{149 => 150}/exclude (100%) create mode 120000 config/rootfiles/core/150/filelists/aarch64/linux create mode 120000 config/rootfiles/core/150/filelists/aarch64/linux-initrd create mode 120000 config/rootfiles/core/150/filelists/armv5tel/linux-initrd-multi create mode 120000 config/rootfiles/core/150/filelists/armv5tel/linux-multi create mode 100644 config/rootfiles/core/150/filelists/files create mode 120000 config/rootfiles/core/150/filelists/i586/linux create mode 120000 config/rootfiles/core/150/filelists/i586/linux-initrd create mode 120000 config/rootfiles/core/150/filelists/x86_64/linux create mode 120000 config/rootfiles/core/150/filelists/x86_64/linux-initrd create mode 100644 config/rootfiles/core/150/update.sh create mode 100644 config/rootfiles/oldcore/149/exclude rename config/rootfiles/{core => oldcore}/149/filelists/aarch64/gcc (100%) rename config/rootfiles/{core => oldcore}/149/filelists/aarch64/glibc (100%) rename config/rootfiles/{core => oldcore}/149/filelists/aarch64/gmp (100%) rename config/rootfiles/{core => oldcore}/149/filelists/aarch64/grub (100%) rename config/rootfiles/{core => oldcore}/149/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/149/filelists/armv5tel/gcc (100%) rename config/rootfiles/{core => oldcore}/149/filelists/armv5tel/glibc (100%) rename config/rootfiles/{core => oldcore}/149/filelists/armv5tel/gmp (100%) rename config/rootfiles/{core => oldcore}/149/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/149/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/149/filelists/files (100%) rename config/rootfiles/{core => oldcore}/149/filelists/gnutls (100%) rename config/rootfiles/{core => oldcore}/149/filelists/gzip (100%) rename config/rootfiles/{core => oldcore}/149/filelists/i586/gcc (100%) rename config/rootfiles/{core => oldcore}/149/filelists/i586/glibc (100%) rename config/rootfiles/{core => oldcore}/149/filelists/i586/gmp (100%) rename config/rootfiles/{core => oldcore}/149/filelists/i586/grub (100%) rename config/rootfiles/{core => oldcore}/149/filelists/i586/hyperscan (100%) rename config/rootfiles/{core => oldcore}/149/filelists/i586/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/149/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/149/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/149/filelists/kbd (100%) rename config/rootfiles/{core => oldcore}/149/filelists/libloc (100%) rename config/rootfiles/{core => oldcore}/149/filelists/logrotate (100%) rename config/rootfiles/{core => oldcore}/149/filelists/mpfr (100%) rename config/rootfiles/{core => oldcore}/149/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/149/filelists/perl (100%) rename config/rootfiles/{core => oldcore}/149/filelists/popt (100%) rename config/rootfiles/{core => oldcore}/149/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/149/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/149/filelists/suricata (100%) rename config/rootfiles/{core => oldcore}/149/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/149/filelists/vim (100%) rename config/rootfiles/{core => oldcore}/149/filelists/x86_64/gcc (100%) rename config/rootfiles/{core => oldcore}/149/filelists/x86_64/glibc (100%) rename config/rootfiles/{core => oldcore}/149/filelists/x86_64/gmp (100%) rename config/rootfiles/{core => oldcore}/149/filelists/x86_64/grub (100%) rename config/rootfiles/{core => oldcore}/149/filelists/x86_64/hyperscan (100%) rename config/rootfiles/{core => oldcore}/149/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/149/filelists/xz (100%) rename config/rootfiles/{core => oldcore}/149/filelists/zstd (100%) rename config/rootfiles/{core => oldcore}/149/update.sh (100%) diff --git a/config/rootfiles/core/149/exclude b/config/rootfiles/core/150/exclude similarity index 100% rename from config/rootfiles/core/149/exclude rename to config/rootfiles/core/150/exclude diff --git a/config/rootfiles/core/150/filelists/aarch64/linux b/config/rootfiles/core/150/filelists/aarch64/linux new file mode 120000 index 0000000000..3a2532bc7d --- /dev/null +++ b/config/rootfiles/core/150/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/150/filelists/aarch64/linux-initrd b/config/rootfiles/core/150/filelists/aarch64/linux-initrd new file mode 120000 index 0000000000..8acdb0f318 --- /dev/null +++ b/config/rootfiles/core/150/filelists/aarch64/linux-initrd @@ -0,0 +1 @@ +../../../../common/aarch64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/150/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/150/filelists/armv5tel/linux-initrd-multi new file mode 120000 index 0000000000..0b1b4530a8 --- /dev/null +++ b/config/rootfiles/core/150/filelists/armv5tel/linux-initrd-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-initrd-multi \ No newline at end of file diff --git a/config/rootfiles/core/150/filelists/armv5tel/linux-multi b/config/rootfiles/core/150/filelists/armv5tel/linux-multi new file mode 120000 index 0000000000..204eb4c437 --- /dev/null +++ b/config/rootfiles/core/150/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/150/filelists/files b/config/rootfiles/core/150/filelists/files new file mode 100644 index 0000000000..ce4e517681 --- /dev/null +++ b/config/rootfiles/core/150/filelists/files @@ -0,0 +1,4 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/150/filelists/i586/linux b/config/rootfiles/core/150/filelists/i586/linux new file mode 120000 index 0000000000..693ec4bbf9 --- /dev/null +++ b/config/rootfiles/core/150/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/150/filelists/i586/linux-initrd b/config/rootfiles/core/150/filelists/i586/linux-initrd new file mode 120000 index 0000000000..32a03e6a90 --- /dev/null +++ b/config/rootfiles/core/150/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/150/filelists/x86_64/linux b/config/rootfiles/core/150/filelists/x86_64/linux new file mode 120000 index 0000000000..0615b5b9ad --- /dev/null +++ b/config/rootfiles/core/150/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/150/filelists/x86_64/linux-initrd b/config/rootfiles/core/150/filelists/x86_64/linux-initrd new file mode 120000 index 0000000000..1b9fff70ff --- /dev/null +++ b/config/rootfiles/core/150/filelists/x86_64/linux-initrd @@ -0,0 +1 @@ +../../../../common/x86_64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/150/update.sh b/config/rootfiles/core/150/update.sh new file mode 100644 index 0000000000..a5468a65df --- /dev/null +++ b/config/rootfiles/core/150/update.sh @@ -0,0 +1,136 @@ +#!/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) 2020 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=150 + +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # force fsck at next boot, this may fix free space on xfs + touch /forcefsck + # 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-kirkwood) + exit_with_error "ERROR cannot update. kirkwood kernel was not supported." 1 + ;; + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac +if [ -e /boot/grub/grub.conf ]; then + exit_with_error "ERROR unsupported GRUB1/pygrub found!" 1 +fi + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; 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 + +# Remove files + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Start services + +# remove lm_sensor config after collectd was started +# to reserch sensors at next boot with updated kernel +rm -f /etc/sysconfig/lm_sensors + +# 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 + +# 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 diff --git a/config/rootfiles/oldcore/149/exclude b/config/rootfiles/oldcore/149/exclude new file mode 100644 index 0000000000..e7500a03d2 --- /dev/null +++ b/config/rootfiles/oldcore/149/exclude @@ -0,0 +1,32 @@ +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/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/firewall/locationblock +var/ipfire/fwhosts/customlocationgrp +var/ipfire/ovpn +var/ipfire/urlfilter/blacklist +var/ipfire/urlfilter/settings +var/lib/alternatives +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/149/filelists/aarch64/gcc b/config/rootfiles/oldcore/149/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/149/filelists/aarch64/gcc rename to config/rootfiles/oldcore/149/filelists/aarch64/gcc diff --git a/config/rootfiles/core/149/filelists/aarch64/glibc b/config/rootfiles/oldcore/149/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/149/filelists/aarch64/glibc rename to config/rootfiles/oldcore/149/filelists/aarch64/glibc diff --git a/config/rootfiles/core/149/filelists/aarch64/gmp b/config/rootfiles/oldcore/149/filelists/aarch64/gmp similarity index 100% rename from config/rootfiles/core/149/filelists/aarch64/gmp rename to config/rootfiles/oldcore/149/filelists/aarch64/gmp diff --git a/config/rootfiles/core/149/filelists/aarch64/grub b/config/rootfiles/oldcore/149/filelists/aarch64/grub similarity index 100% rename from config/rootfiles/core/149/filelists/aarch64/grub rename to config/rootfiles/oldcore/149/filelists/aarch64/grub diff --git a/config/rootfiles/core/149/filelists/apache2 b/config/rootfiles/oldcore/149/filelists/apache2 similarity index 100% rename from config/rootfiles/core/149/filelists/apache2 rename to config/rootfiles/oldcore/149/filelists/apache2 diff --git a/config/rootfiles/core/149/filelists/armv5tel/gcc b/config/rootfiles/oldcore/149/filelists/armv5tel/gcc similarity index 100% rename from config/rootfiles/core/149/filelists/armv5tel/gcc rename to config/rootfiles/oldcore/149/filelists/armv5tel/gcc diff --git a/config/rootfiles/core/149/filelists/armv5tel/glibc b/config/rootfiles/oldcore/149/filelists/armv5tel/glibc similarity index 100% rename from config/rootfiles/core/149/filelists/armv5tel/glibc rename to config/rootfiles/oldcore/149/filelists/armv5tel/glibc diff --git a/config/rootfiles/core/149/filelists/armv5tel/gmp b/config/rootfiles/oldcore/149/filelists/armv5tel/gmp similarity index 100% rename from config/rootfiles/core/149/filelists/armv5tel/gmp rename to config/rootfiles/oldcore/149/filelists/armv5tel/gmp diff --git a/config/rootfiles/core/149/filelists/bind b/config/rootfiles/oldcore/149/filelists/bind similarity index 100% rename from config/rootfiles/core/149/filelists/bind rename to config/rootfiles/oldcore/149/filelists/bind diff --git a/config/rootfiles/core/149/filelists/curl b/config/rootfiles/oldcore/149/filelists/curl similarity index 100% rename from config/rootfiles/core/149/filelists/curl rename to config/rootfiles/oldcore/149/filelists/curl diff --git a/config/rootfiles/core/149/filelists/files b/config/rootfiles/oldcore/149/filelists/files similarity index 100% rename from config/rootfiles/core/149/filelists/files rename to config/rootfiles/oldcore/149/filelists/files diff --git a/config/rootfiles/core/149/filelists/gnutls b/config/rootfiles/oldcore/149/filelists/gnutls similarity index 100% rename from config/rootfiles/core/149/filelists/gnutls rename to config/rootfiles/oldcore/149/filelists/gnutls diff --git a/config/rootfiles/core/149/filelists/gzip b/config/rootfiles/oldcore/149/filelists/gzip similarity index 100% rename from config/rootfiles/core/149/filelists/gzip rename to config/rootfiles/oldcore/149/filelists/gzip diff --git a/config/rootfiles/core/149/filelists/i586/gcc b/config/rootfiles/oldcore/149/filelists/i586/gcc similarity index 100% rename from config/rootfiles/core/149/filelists/i586/gcc rename to config/rootfiles/oldcore/149/filelists/i586/gcc diff --git a/config/rootfiles/core/149/filelists/i586/glibc b/config/rootfiles/oldcore/149/filelists/i586/glibc similarity index 100% rename from config/rootfiles/core/149/filelists/i586/glibc rename to config/rootfiles/oldcore/149/filelists/i586/glibc diff --git a/config/rootfiles/core/149/filelists/i586/gmp b/config/rootfiles/oldcore/149/filelists/i586/gmp similarity index 100% rename from config/rootfiles/core/149/filelists/i586/gmp rename to config/rootfiles/oldcore/149/filelists/i586/gmp diff --git a/config/rootfiles/core/149/filelists/i586/grub b/config/rootfiles/oldcore/149/filelists/i586/grub similarity index 100% rename from config/rootfiles/core/149/filelists/i586/grub rename to config/rootfiles/oldcore/149/filelists/i586/grub diff --git a/config/rootfiles/core/149/filelists/i586/hyperscan b/config/rootfiles/oldcore/149/filelists/i586/hyperscan similarity index 100% rename from config/rootfiles/core/149/filelists/i586/hyperscan rename to config/rootfiles/oldcore/149/filelists/i586/hyperscan diff --git a/config/rootfiles/core/149/filelists/i586/intel-microcode b/config/rootfiles/oldcore/149/filelists/i586/intel-microcode similarity index 100% rename from config/rootfiles/core/149/filelists/i586/intel-microcode rename to config/rootfiles/oldcore/149/filelists/i586/intel-microcode diff --git a/config/rootfiles/core/149/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/149/filelists/i586/openssl-sse2 similarity index 100% rename from config/rootfiles/core/149/filelists/i586/openssl-sse2 rename to config/rootfiles/oldcore/149/filelists/i586/openssl-sse2 diff --git a/config/rootfiles/core/149/filelists/iproute2 b/config/rootfiles/oldcore/149/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/149/filelists/iproute2 rename to config/rootfiles/oldcore/149/filelists/iproute2 diff --git a/config/rootfiles/core/149/filelists/kbd b/config/rootfiles/oldcore/149/filelists/kbd similarity index 100% rename from config/rootfiles/core/149/filelists/kbd rename to config/rootfiles/oldcore/149/filelists/kbd diff --git a/config/rootfiles/core/149/filelists/libloc b/config/rootfiles/oldcore/149/filelists/libloc similarity index 100% rename from config/rootfiles/core/149/filelists/libloc rename to config/rootfiles/oldcore/149/filelists/libloc diff --git a/config/rootfiles/core/149/filelists/logrotate b/config/rootfiles/oldcore/149/filelists/logrotate similarity index 100% rename from config/rootfiles/core/149/filelists/logrotate rename to config/rootfiles/oldcore/149/filelists/logrotate diff --git a/config/rootfiles/core/149/filelists/mpfr b/config/rootfiles/oldcore/149/filelists/mpfr similarity index 100% rename from config/rootfiles/core/149/filelists/mpfr rename to config/rootfiles/oldcore/149/filelists/mpfr diff --git a/config/rootfiles/core/149/filelists/openssl b/config/rootfiles/oldcore/149/filelists/openssl similarity index 100% rename from config/rootfiles/core/149/filelists/openssl rename to config/rootfiles/oldcore/149/filelists/openssl diff --git a/config/rootfiles/core/149/filelists/perl b/config/rootfiles/oldcore/149/filelists/perl similarity index 100% rename from config/rootfiles/core/149/filelists/perl rename to config/rootfiles/oldcore/149/filelists/perl diff --git a/config/rootfiles/core/149/filelists/popt b/config/rootfiles/oldcore/149/filelists/popt similarity index 100% rename from config/rootfiles/core/149/filelists/popt rename to config/rootfiles/oldcore/149/filelists/popt diff --git a/config/rootfiles/core/149/filelists/squid b/config/rootfiles/oldcore/149/filelists/squid similarity index 100% rename from config/rootfiles/core/149/filelists/squid rename to config/rootfiles/oldcore/149/filelists/squid diff --git a/config/rootfiles/core/149/filelists/strongswan b/config/rootfiles/oldcore/149/filelists/strongswan similarity index 100% rename from config/rootfiles/core/149/filelists/strongswan rename to config/rootfiles/oldcore/149/filelists/strongswan diff --git a/config/rootfiles/core/149/filelists/suricata b/config/rootfiles/oldcore/149/filelists/suricata similarity index 100% rename from config/rootfiles/core/149/filelists/suricata rename to config/rootfiles/oldcore/149/filelists/suricata diff --git a/config/rootfiles/core/149/filelists/unbound b/config/rootfiles/oldcore/149/filelists/unbound similarity index 100% rename from config/rootfiles/core/149/filelists/unbound rename to config/rootfiles/oldcore/149/filelists/unbound diff --git a/config/rootfiles/core/149/filelists/vim b/config/rootfiles/oldcore/149/filelists/vim similarity index 100% rename from config/rootfiles/core/149/filelists/vim rename to config/rootfiles/oldcore/149/filelists/vim diff --git a/config/rootfiles/core/149/filelists/x86_64/gcc b/config/rootfiles/oldcore/149/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/149/filelists/x86_64/gcc rename to config/rootfiles/oldcore/149/filelists/x86_64/gcc diff --git a/config/rootfiles/core/149/filelists/x86_64/glibc b/config/rootfiles/oldcore/149/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/149/filelists/x86_64/glibc rename to config/rootfiles/oldcore/149/filelists/x86_64/glibc diff --git a/config/rootfiles/core/149/filelists/x86_64/gmp b/config/rootfiles/oldcore/149/filelists/x86_64/gmp similarity index 100% rename from config/rootfiles/core/149/filelists/x86_64/gmp rename to config/rootfiles/oldcore/149/filelists/x86_64/gmp diff --git a/config/rootfiles/core/149/filelists/x86_64/grub b/config/rootfiles/oldcore/149/filelists/x86_64/grub similarity index 100% rename from config/rootfiles/core/149/filelists/x86_64/grub rename to config/rootfiles/oldcore/149/filelists/x86_64/grub diff --git a/config/rootfiles/core/149/filelists/x86_64/hyperscan b/config/rootfiles/oldcore/149/filelists/x86_64/hyperscan similarity index 100% rename from config/rootfiles/core/149/filelists/x86_64/hyperscan rename to config/rootfiles/oldcore/149/filelists/x86_64/hyperscan diff --git a/config/rootfiles/core/149/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/149/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/149/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/149/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/149/filelists/xz b/config/rootfiles/oldcore/149/filelists/xz similarity index 100% rename from config/rootfiles/core/149/filelists/xz rename to config/rootfiles/oldcore/149/filelists/xz diff --git a/config/rootfiles/core/149/filelists/zstd b/config/rootfiles/oldcore/149/filelists/zstd similarity index 100% rename from config/rootfiles/core/149/filelists/zstd rename to config/rootfiles/oldcore/149/filelists/zstd diff --git a/config/rootfiles/core/149/update.sh b/config/rootfiles/oldcore/149/update.sh similarity index 100% rename from config/rootfiles/core/149/update.sh rename to config/rootfiles/oldcore/149/update.sh diff --git a/make.sh b/make.sh index 2a6198e05b..4a9dd3cb66 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name 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 -- 2.39.5