From 28aacf565b1fc5c38f757c931cdfd42fa6e63051 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 18 Jun 2018 16:43:04 +0100 Subject: [PATCH 1/1] Start Core Update 123 Signed-off-by: Michael Tremer --- config/rootfiles/core/{121 => 123}/exclude | 0 config/rootfiles/core/123/filelists/coreutils | 1 + config/rootfiles/core/123/filelists/files | 6 ++ config/rootfiles/core/123/filelists/ipset | 1 + config/rootfiles/core/123/filelists/libgcrypt | 1 + config/rootfiles/core/123/filelists/tzdata | 1 + .../core/{121 => 123}/filelists/unbound | 0 config/rootfiles/core/123/update.sh | 63 +++++++++++++++++++ config/rootfiles/oldcore/121/exclude | 30 +++++++++ .../{core => oldcore}/121/filelists/acpid | 0 .../{core => oldcore}/121/filelists/apache2 | 0 .../{core => oldcore}/121/filelists/apr | 0 .../{core => oldcore}/121/filelists/aprutil | 0 .../121/filelists/armv5tel/files | 0 .../filelists/armv5tel/linux-initrd-kirkwood | 0 .../121/filelists/armv5tel/linux-initrd-multi | 0 .../121/filelists/armv5tel/linux-initrd-rpi | 0 .../121/filelists/armv5tel/linux-kirkwood | 0 .../121/filelists/armv5tel/linux-multi | 0 .../121/filelists/armv5tel/linux-rpi | 0 .../121/filelists/armv5tel/rpi-firmware | 0 .../121/filelists/armv5tel/u-boot | 0 .../121/filelists/armv5tel/u-boot-kirkwood | 0 .../121/filelists/armv5tel/u-boot-mkimage | 0 .../{core => oldcore}/121/filelists/beep | 0 .../121/filelists/ca-certificates | 0 .../{core => oldcore}/121/filelists/cmake | 0 .../{core => oldcore}/121/filelists/crda | 0 .../{core => oldcore}/121/filelists/dhcp | 0 .../{core => oldcore}/121/filelists/files | 0 .../{core => oldcore}/121/filelists/flex | 0 .../{core => oldcore}/121/filelists/i586/grub | 0 .../121/filelists/i586/intel-microcode | 0 .../121/filelists/i586/linux | 0 .../121/filelists/i586/linux-initrd | 0 .../{core => oldcore}/121/filelists/iw | 0 .../{core => oldcore}/121/filelists/jwhois | 0 .../{core => oldcore}/121/filelists/libidn | 0 .../121/filelists/linux-firmware | 0 .../121/filelists/multipath-tools | 0 .../{core => oldcore}/121/filelists/openssl | 0 .../{core => oldcore}/121/filelists/pcre | 0 .../{core => oldcore}/121/filelists/rng-tools | 0 .../{core => oldcore}/121/filelists/tar | 0 .../rootfiles/oldcore/121/filelists/unbound | 1 + .../{core => oldcore}/121/filelists/wget | 0 .../121/filelists/x86_64/grub | 0 .../121/filelists/x86_64/intel-microcode | 0 .../121/filelists/x86_64/linux | 0 .../121/filelists/x86_64/linux-initrd | 0 .../121/filelists/xr819-firmware | 0 .../121/filelists/xtables-addons | 0 .../{core => oldcore}/121/filelists/xz | 0 config/rootfiles/{core => oldcore}/121/meta | 0 .../rootfiles/{core => oldcore}/121/update.sh | 0 make.sh | 4 +- 56 files changed, 106 insertions(+), 2 deletions(-) rename config/rootfiles/core/{121 => 123}/exclude (100%) create mode 120000 config/rootfiles/core/123/filelists/coreutils create mode 100644 config/rootfiles/core/123/filelists/files create mode 120000 config/rootfiles/core/123/filelists/ipset create mode 120000 config/rootfiles/core/123/filelists/libgcrypt create mode 120000 config/rootfiles/core/123/filelists/tzdata rename config/rootfiles/core/{121 => 123}/filelists/unbound (100%) create mode 100644 config/rootfiles/core/123/update.sh create mode 100644 config/rootfiles/oldcore/121/exclude rename config/rootfiles/{core => oldcore}/121/filelists/acpid (100%) rename config/rootfiles/{core => oldcore}/121/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/121/filelists/apr (100%) rename config/rootfiles/{core => oldcore}/121/filelists/aprutil (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/files (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/linux-initrd-kirkwood (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/linux-initrd-multi (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/linux-initrd-rpi (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/rpi-firmware (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/u-boot (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/u-boot-kirkwood (100%) rename config/rootfiles/{core => oldcore}/121/filelists/armv5tel/u-boot-mkimage (100%) rename config/rootfiles/{core => oldcore}/121/filelists/beep (100%) rename config/rootfiles/{core => oldcore}/121/filelists/ca-certificates (100%) rename config/rootfiles/{core => oldcore}/121/filelists/cmake (100%) rename config/rootfiles/{core => oldcore}/121/filelists/crda (100%) rename config/rootfiles/{core => oldcore}/121/filelists/dhcp (100%) rename config/rootfiles/{core => oldcore}/121/filelists/files (100%) rename config/rootfiles/{core => oldcore}/121/filelists/flex (100%) rename config/rootfiles/{core => oldcore}/121/filelists/i586/grub (100%) rename config/rootfiles/{core => oldcore}/121/filelists/i586/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/121/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/121/filelists/i586/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/121/filelists/iw (100%) rename config/rootfiles/{core => oldcore}/121/filelists/jwhois (100%) rename config/rootfiles/{core => oldcore}/121/filelists/libidn (100%) rename config/rootfiles/{core => oldcore}/121/filelists/linux-firmware (100%) rename config/rootfiles/{core => oldcore}/121/filelists/multipath-tools (100%) rename config/rootfiles/{core => oldcore}/121/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/121/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/121/filelists/rng-tools (100%) rename config/rootfiles/{core => oldcore}/121/filelists/tar (100%) create mode 120000 config/rootfiles/oldcore/121/filelists/unbound rename config/rootfiles/{core => oldcore}/121/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/121/filelists/x86_64/grub (100%) rename config/rootfiles/{core => oldcore}/121/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/121/filelists/x86_64/linux (100%) rename config/rootfiles/{core => oldcore}/121/filelists/x86_64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/121/filelists/xr819-firmware (100%) rename config/rootfiles/{core => oldcore}/121/filelists/xtables-addons (100%) rename config/rootfiles/{core => oldcore}/121/filelists/xz (100%) rename config/rootfiles/{core => oldcore}/121/meta (100%) rename config/rootfiles/{core => oldcore}/121/update.sh (100%) diff --git a/config/rootfiles/core/121/exclude b/config/rootfiles/core/123/exclude similarity index 100% rename from config/rootfiles/core/121/exclude rename to config/rootfiles/core/123/exclude diff --git a/config/rootfiles/core/123/filelists/coreutils b/config/rootfiles/core/123/filelists/coreutils new file mode 120000 index 0000000000..7351ed2cf5 --- /dev/null +++ b/config/rootfiles/core/123/filelists/coreutils @@ -0,0 +1 @@ +../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/core/123/filelists/files new file mode 100644 index 0000000000..2e8d7961f3 --- /dev/null +++ b/config/rootfiles/core/123/filelists/files @@ -0,0 +1,6 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/123/filelists/ipset b/config/rootfiles/core/123/filelists/ipset new file mode 120000 index 0000000000..2b43691f24 --- /dev/null +++ b/config/rootfiles/core/123/filelists/ipset @@ -0,0 +1 @@ +../../../common/ipset \ No newline at end of file diff --git a/config/rootfiles/core/123/filelists/libgcrypt b/config/rootfiles/core/123/filelists/libgcrypt new file mode 120000 index 0000000000..2df12a20ec --- /dev/null +++ b/config/rootfiles/core/123/filelists/libgcrypt @@ -0,0 +1 @@ +../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/core/123/filelists/tzdata b/config/rootfiles/core/123/filelists/tzdata new file mode 120000 index 0000000000..5a6e3252f3 --- /dev/null +++ b/config/rootfiles/core/123/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/unbound b/config/rootfiles/core/123/filelists/unbound similarity index 100% rename from config/rootfiles/core/121/filelists/unbound rename to config/rootfiles/core/123/filelists/unbound diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/core/123/update.sh new file mode 100644 index 0000000000..1e9b1d1937 --- /dev/null +++ b/config/rootfiles/core/123/update.sh @@ -0,0 +1,63 @@ +#!/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 . # +# # +############################################################################ +# +. /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 + +# 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 diff --git a/config/rootfiles/oldcore/121/exclude b/config/rootfiles/oldcore/121/exclude new file mode 100644 index 0000000000..d6fd053b6e --- /dev/null +++ b/config/rootfiles/oldcore/121/exclude @@ -0,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 diff --git a/config/rootfiles/core/121/filelists/acpid b/config/rootfiles/oldcore/121/filelists/acpid similarity index 100% rename from config/rootfiles/core/121/filelists/acpid rename to config/rootfiles/oldcore/121/filelists/acpid diff --git a/config/rootfiles/core/121/filelists/apache2 b/config/rootfiles/oldcore/121/filelists/apache2 similarity index 100% rename from config/rootfiles/core/121/filelists/apache2 rename to config/rootfiles/oldcore/121/filelists/apache2 diff --git a/config/rootfiles/core/121/filelists/apr b/config/rootfiles/oldcore/121/filelists/apr similarity index 100% rename from config/rootfiles/core/121/filelists/apr rename to config/rootfiles/oldcore/121/filelists/apr diff --git a/config/rootfiles/core/121/filelists/aprutil b/config/rootfiles/oldcore/121/filelists/aprutil similarity index 100% rename from config/rootfiles/core/121/filelists/aprutil rename to config/rootfiles/oldcore/121/filelists/aprutil diff --git a/config/rootfiles/core/121/filelists/armv5tel/files b/config/rootfiles/oldcore/121/filelists/armv5tel/files similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/files rename to config/rootfiles/oldcore/121/filelists/armv5tel/files diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-kirkwood similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood rename to config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-kirkwood diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-multi similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi rename to config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-multi diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi b/config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-rpi similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi rename to config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-rpi diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/121/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/oldcore/121/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/121/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-multi rename to config/rootfiles/oldcore/121/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/121/filelists/armv5tel/linux-rpi similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-rpi rename to config/rootfiles/oldcore/121/filelists/armv5tel/linux-rpi diff --git a/config/rootfiles/core/121/filelists/armv5tel/rpi-firmware b/config/rootfiles/oldcore/121/filelists/armv5tel/rpi-firmware similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/rpi-firmware rename to config/rootfiles/oldcore/121/filelists/armv5tel/rpi-firmware diff --git a/config/rootfiles/core/121/filelists/armv5tel/u-boot b/config/rootfiles/oldcore/121/filelists/armv5tel/u-boot similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/u-boot rename to config/rootfiles/oldcore/121/filelists/armv5tel/u-boot diff --git a/config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood b/config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-kirkwood similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood rename to config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-kirkwood diff --git a/config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage b/config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-mkimage similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage rename to config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-mkimage diff --git a/config/rootfiles/core/121/filelists/beep b/config/rootfiles/oldcore/121/filelists/beep similarity index 100% rename from config/rootfiles/core/121/filelists/beep rename to config/rootfiles/oldcore/121/filelists/beep diff --git a/config/rootfiles/core/121/filelists/ca-certificates b/config/rootfiles/oldcore/121/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/121/filelists/ca-certificates rename to config/rootfiles/oldcore/121/filelists/ca-certificates diff --git a/config/rootfiles/core/121/filelists/cmake b/config/rootfiles/oldcore/121/filelists/cmake similarity index 100% rename from config/rootfiles/core/121/filelists/cmake rename to config/rootfiles/oldcore/121/filelists/cmake diff --git a/config/rootfiles/core/121/filelists/crda b/config/rootfiles/oldcore/121/filelists/crda similarity index 100% rename from config/rootfiles/core/121/filelists/crda rename to config/rootfiles/oldcore/121/filelists/crda diff --git a/config/rootfiles/core/121/filelists/dhcp b/config/rootfiles/oldcore/121/filelists/dhcp similarity index 100% rename from config/rootfiles/core/121/filelists/dhcp rename to config/rootfiles/oldcore/121/filelists/dhcp diff --git a/config/rootfiles/core/121/filelists/files b/config/rootfiles/oldcore/121/filelists/files similarity index 100% rename from config/rootfiles/core/121/filelists/files rename to config/rootfiles/oldcore/121/filelists/files diff --git a/config/rootfiles/core/121/filelists/flex b/config/rootfiles/oldcore/121/filelists/flex similarity index 100% rename from config/rootfiles/core/121/filelists/flex rename to config/rootfiles/oldcore/121/filelists/flex diff --git a/config/rootfiles/core/121/filelists/i586/grub b/config/rootfiles/oldcore/121/filelists/i586/grub similarity index 100% rename from config/rootfiles/core/121/filelists/i586/grub rename to config/rootfiles/oldcore/121/filelists/i586/grub diff --git a/config/rootfiles/core/121/filelists/i586/intel-microcode b/config/rootfiles/oldcore/121/filelists/i586/intel-microcode similarity index 100% rename from config/rootfiles/core/121/filelists/i586/intel-microcode rename to config/rootfiles/oldcore/121/filelists/i586/intel-microcode diff --git a/config/rootfiles/core/121/filelists/i586/linux b/config/rootfiles/oldcore/121/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/121/filelists/i586/linux rename to config/rootfiles/oldcore/121/filelists/i586/linux diff --git a/config/rootfiles/core/121/filelists/i586/linux-initrd b/config/rootfiles/oldcore/121/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/121/filelists/i586/linux-initrd rename to config/rootfiles/oldcore/121/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/121/filelists/iw b/config/rootfiles/oldcore/121/filelists/iw similarity index 100% rename from config/rootfiles/core/121/filelists/iw rename to config/rootfiles/oldcore/121/filelists/iw diff --git a/config/rootfiles/core/121/filelists/jwhois b/config/rootfiles/oldcore/121/filelists/jwhois similarity index 100% rename from config/rootfiles/core/121/filelists/jwhois rename to config/rootfiles/oldcore/121/filelists/jwhois diff --git a/config/rootfiles/core/121/filelists/libidn b/config/rootfiles/oldcore/121/filelists/libidn similarity index 100% rename from config/rootfiles/core/121/filelists/libidn rename to config/rootfiles/oldcore/121/filelists/libidn diff --git a/config/rootfiles/core/121/filelists/linux-firmware b/config/rootfiles/oldcore/121/filelists/linux-firmware similarity index 100% rename from config/rootfiles/core/121/filelists/linux-firmware rename to config/rootfiles/oldcore/121/filelists/linux-firmware diff --git a/config/rootfiles/core/121/filelists/multipath-tools b/config/rootfiles/oldcore/121/filelists/multipath-tools similarity index 100% rename from config/rootfiles/core/121/filelists/multipath-tools rename to config/rootfiles/oldcore/121/filelists/multipath-tools diff --git a/config/rootfiles/core/121/filelists/openssl b/config/rootfiles/oldcore/121/filelists/openssl similarity index 100% rename from config/rootfiles/core/121/filelists/openssl rename to config/rootfiles/oldcore/121/filelists/openssl diff --git a/config/rootfiles/core/121/filelists/pcre b/config/rootfiles/oldcore/121/filelists/pcre similarity index 100% rename from config/rootfiles/core/121/filelists/pcre rename to config/rootfiles/oldcore/121/filelists/pcre diff --git a/config/rootfiles/core/121/filelists/rng-tools b/config/rootfiles/oldcore/121/filelists/rng-tools similarity index 100% rename from config/rootfiles/core/121/filelists/rng-tools rename to config/rootfiles/oldcore/121/filelists/rng-tools diff --git a/config/rootfiles/core/121/filelists/tar b/config/rootfiles/oldcore/121/filelists/tar similarity index 100% rename from config/rootfiles/core/121/filelists/tar rename to config/rootfiles/oldcore/121/filelists/tar diff --git a/config/rootfiles/oldcore/121/filelists/unbound b/config/rootfiles/oldcore/121/filelists/unbound new file mode 120000 index 0000000000..66adf09242 --- /dev/null +++ b/config/rootfiles/oldcore/121/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/wget b/config/rootfiles/oldcore/121/filelists/wget similarity index 100% rename from config/rootfiles/core/121/filelists/wget rename to config/rootfiles/oldcore/121/filelists/wget diff --git a/config/rootfiles/core/121/filelists/x86_64/grub b/config/rootfiles/oldcore/121/filelists/x86_64/grub similarity index 100% rename from config/rootfiles/core/121/filelists/x86_64/grub rename to config/rootfiles/oldcore/121/filelists/x86_64/grub diff --git a/config/rootfiles/core/121/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/121/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/121/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/121/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/121/filelists/x86_64/linux b/config/rootfiles/oldcore/121/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/121/filelists/x86_64/linux rename to config/rootfiles/oldcore/121/filelists/x86_64/linux diff --git a/config/rootfiles/core/121/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/121/filelists/x86_64/linux-initrd similarity index 100% rename from config/rootfiles/core/121/filelists/x86_64/linux-initrd rename to config/rootfiles/oldcore/121/filelists/x86_64/linux-initrd diff --git a/config/rootfiles/core/121/filelists/xr819-firmware b/config/rootfiles/oldcore/121/filelists/xr819-firmware similarity index 100% rename from config/rootfiles/core/121/filelists/xr819-firmware rename to config/rootfiles/oldcore/121/filelists/xr819-firmware diff --git a/config/rootfiles/core/121/filelists/xtables-addons b/config/rootfiles/oldcore/121/filelists/xtables-addons similarity index 100% rename from config/rootfiles/core/121/filelists/xtables-addons rename to config/rootfiles/oldcore/121/filelists/xtables-addons diff --git a/config/rootfiles/core/121/filelists/xz b/config/rootfiles/oldcore/121/filelists/xz similarity index 100% rename from config/rootfiles/core/121/filelists/xz rename to config/rootfiles/oldcore/121/filelists/xz diff --git a/config/rootfiles/core/121/meta b/config/rootfiles/oldcore/121/meta similarity index 100% rename from config/rootfiles/core/121/meta rename to config/rootfiles/oldcore/121/meta diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/oldcore/121/update.sh similarity index 100% rename from config/rootfiles/core/121/update.sh rename to config/rootfiles/oldcore/121/update.sh diff --git a/make.sh b/make.sh index e8591f363b..0238cc3871 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.21" # Version number -CORE="121" # Core Level (Filename) -PAKFIRE_CORE="120" # Core Level (PAKFIRE) +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 CONFIG_ROOT=/var/ipfire # Configuration rootdir -- 2.39.2