From b4d83d1af3619dfabf8daac154e6c19b09f1bdb7 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 18 May 2021 13:34:15 +0000 Subject: [PATCH] Start Core Update 158 Signed-off-by: Michael Tremer --- config/rootfiles/core/{157 => 158}/exclude | 0 .../core/{157 => 158}/filelists/release-files | 0 config/rootfiles/core/158/update.sh | 67 +++++++++++++++++++ config/rootfiles/oldcore/157/exclude | 34 ++++++++++ .../157/filelists/Canary-Stability | 0 .../157/filelists/Convert-TNEF | 0 .../157/filelists/Convert-UUlib | 0 .../157/filelists/Crypt-PasswdMD5 | 0 .../{core => oldcore}/157/filelists/Digest | 0 .../157/filelists/aarch64/linux | 0 .../157/filelists/aarch64/linux-initrd | 0 .../157/filelists/aarch64/lm_sensors | 0 .../{core => oldcore}/157/filelists/apache2 | 0 .../157/filelists/armv5tel/linux-initrd-multi | 0 .../157/filelists/armv5tel/linux-multi | 0 .../157/filelists/armv5tel/lm_sensors | 0 .../{core => oldcore}/157/filelists/bash | 0 .../{core => oldcore}/157/filelists/boost | 0 .../{core => oldcore}/157/filelists/collectd | 0 .../{core => oldcore}/157/filelists/curl | 0 .../{core => oldcore}/157/filelists/ddns | 0 .../157/filelists/dejavu-fonts-ttf | 0 .../{core => oldcore}/157/filelists/expat | 0 .../{core => oldcore}/157/filelists/file | 0 .../{core => oldcore}/157/filelists/files | 0 .../{core => oldcore}/157/filelists/fuse | 0 .../{core => oldcore}/157/filelists/glib | 0 .../157/filelists/i586/linux | 0 .../157/filelists/i586/linux-initrd | 0 .../157/filelists/i586/lm_sensors | 0 .../{core => oldcore}/157/filelists/iproute2 | 0 .../{core => oldcore}/157/filelists/iputils | 0 .../{core => oldcore}/157/filelists/less | 0 .../{core => oldcore}/157/filelists/libaio | 0 .../157/filelists/libarchive | 0 .../{core => oldcore}/157/filelists/libcap-ng | 0 .../{core => oldcore}/157/filelists/libedit | 0 .../{core => oldcore}/157/filelists/libevent2 | 0 .../{core => oldcore}/157/filelists/libgcrypt | 0 .../157/filelists/libgpg-error | 0 .../{core => oldcore}/157/filelists/libjpeg | 0 .../{core => oldcore}/157/filelists/libupnp | 0 .../{core => oldcore}/157/filelists/libxcrypt | 0 .../{core => oldcore}/157/filelists/libxml2 | 0 .../{core => oldcore}/157/filelists/libxslt | 0 .../{core => oldcore}/157/filelists/newt | 0 .../{core => oldcore}/157/filelists/openssh | 0 .../{core => oldcore}/157/filelists/pixman | 0 .../{core => oldcore}/157/filelists/poppler | 0 .../157/filelists/poppler-data | 0 .../{core => oldcore}/157/filelists/ppp | 0 .../157/filelists/python3-daemon | 0 .../{core => oldcore}/157/filelists/readline | 0 .../oldcore/157/filelists/release-files | 5 ++ .../{core => oldcore}/157/filelists/sqlite | 0 .../{core => oldcore}/157/filelists/squid | 0 .../{core => oldcore}/157/filelists/sudo | 0 .../157/filelists/x86_64/linux | 0 .../157/filelists/x86_64/linux-initrd | 0 .../157/filelists/x86_64/lm_sensors | 0 .../{core => oldcore}/157/filelists/xfsprogs | 0 .../rootfiles/{core => oldcore}/157/update.sh | 0 make.sh | 2 +- 63 files changed, 107 insertions(+), 1 deletion(-) rename config/rootfiles/core/{157 => 158}/exclude (100%) rename config/rootfiles/core/{157 => 158}/filelists/release-files (100%) create mode 100644 config/rootfiles/core/158/update.sh create mode 100644 config/rootfiles/oldcore/157/exclude rename config/rootfiles/{core => oldcore}/157/filelists/Canary-Stability (100%) rename config/rootfiles/{core => oldcore}/157/filelists/Convert-TNEF (100%) rename config/rootfiles/{core => oldcore}/157/filelists/Convert-UUlib (100%) rename config/rootfiles/{core => oldcore}/157/filelists/Crypt-PasswdMD5 (100%) rename config/rootfiles/{core => oldcore}/157/filelists/Digest (100%) rename config/rootfiles/{core => oldcore}/157/filelists/aarch64/linux (100%) rename config/rootfiles/{core => oldcore}/157/filelists/aarch64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/157/filelists/aarch64/lm_sensors (100%) rename config/rootfiles/{core => oldcore}/157/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/157/filelists/armv5tel/linux-initrd-multi (100%) rename config/rootfiles/{core => oldcore}/157/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/157/filelists/armv5tel/lm_sensors (100%) rename config/rootfiles/{core => oldcore}/157/filelists/bash (100%) rename config/rootfiles/{core => oldcore}/157/filelists/boost (100%) rename config/rootfiles/{core => oldcore}/157/filelists/collectd (100%) rename config/rootfiles/{core => oldcore}/157/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/157/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/157/filelists/dejavu-fonts-ttf (100%) rename config/rootfiles/{core => oldcore}/157/filelists/expat (100%) rename config/rootfiles/{core => oldcore}/157/filelists/file (100%) rename config/rootfiles/{core => oldcore}/157/filelists/files (100%) rename config/rootfiles/{core => oldcore}/157/filelists/fuse (100%) rename config/rootfiles/{core => oldcore}/157/filelists/glib (100%) rename config/rootfiles/{core => oldcore}/157/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/157/filelists/i586/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/157/filelists/i586/lm_sensors (100%) rename config/rootfiles/{core => oldcore}/157/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/157/filelists/iputils (100%) rename config/rootfiles/{core => oldcore}/157/filelists/less (100%) rename config/rootfiles/{core => oldcore}/157/filelists/libaio (100%) rename config/rootfiles/{core => oldcore}/157/filelists/libarchive (100%) rename config/rootfiles/{core => oldcore}/157/filelists/libcap-ng (100%) rename config/rootfiles/{core => oldcore}/157/filelists/libedit (100%) rename config/rootfiles/{core => oldcore}/157/filelists/libevent2 (100%) rename config/rootfiles/{core => oldcore}/157/filelists/libgcrypt (100%) rename config/rootfiles/{core => oldcore}/157/filelists/libgpg-error (100%) rename config/rootfiles/{core => oldcore}/157/filelists/libjpeg (100%) rename config/rootfiles/{core => oldcore}/157/filelists/libupnp (100%) rename config/rootfiles/{core => oldcore}/157/filelists/libxcrypt (100%) rename config/rootfiles/{core => oldcore}/157/filelists/libxml2 (100%) rename config/rootfiles/{core => oldcore}/157/filelists/libxslt (100%) rename config/rootfiles/{core => oldcore}/157/filelists/newt (100%) rename config/rootfiles/{core => oldcore}/157/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/157/filelists/pixman (100%) rename config/rootfiles/{core => oldcore}/157/filelists/poppler (100%) rename config/rootfiles/{core => oldcore}/157/filelists/poppler-data (100%) rename config/rootfiles/{core => oldcore}/157/filelists/ppp (100%) rename config/rootfiles/{core => oldcore}/157/filelists/python3-daemon (100%) rename config/rootfiles/{core => oldcore}/157/filelists/readline (100%) create mode 100644 config/rootfiles/oldcore/157/filelists/release-files rename config/rootfiles/{core => oldcore}/157/filelists/sqlite (100%) rename config/rootfiles/{core => oldcore}/157/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/157/filelists/sudo (100%) rename config/rootfiles/{core => oldcore}/157/filelists/x86_64/linux (100%) rename config/rootfiles/{core => oldcore}/157/filelists/x86_64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/157/filelists/x86_64/lm_sensors (100%) rename config/rootfiles/{core => oldcore}/157/filelists/xfsprogs (100%) rename config/rootfiles/{core => oldcore}/157/update.sh (100%) diff --git a/config/rootfiles/core/157/exclude b/config/rootfiles/core/158/exclude similarity index 100% rename from config/rootfiles/core/157/exclude rename to config/rootfiles/core/158/exclude diff --git a/config/rootfiles/core/157/filelists/release-files b/config/rootfiles/core/158/filelists/release-files similarity index 100% rename from config/rootfiles/core/157/filelists/release-files rename to config/rootfiles/core/158/filelists/release-files diff --git a/config/rootfiles/core/158/update.sh b/config/rootfiles/core/158/update.sh new file mode 100644 index 0000000000..9b79029886 --- /dev/null +++ b/config/rootfiles/core/158/update.sh @@ -0,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) 2020 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=158 + +# 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 + +# 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 + +# 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/157/exclude b/config/rootfiles/oldcore/157/exclude new file mode 100644 index 0000000000..818039f4af --- /dev/null +++ b/config/rootfiles/oldcore/157/exclude @@ -0,0 +1,34 @@ +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 +usr/share/xt_geoip +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/lib/location/database.db +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/157/filelists/Canary-Stability b/config/rootfiles/oldcore/157/filelists/Canary-Stability similarity index 100% rename from config/rootfiles/core/157/filelists/Canary-Stability rename to config/rootfiles/oldcore/157/filelists/Canary-Stability diff --git a/config/rootfiles/core/157/filelists/Convert-TNEF b/config/rootfiles/oldcore/157/filelists/Convert-TNEF similarity index 100% rename from config/rootfiles/core/157/filelists/Convert-TNEF rename to config/rootfiles/oldcore/157/filelists/Convert-TNEF diff --git a/config/rootfiles/core/157/filelists/Convert-UUlib b/config/rootfiles/oldcore/157/filelists/Convert-UUlib similarity index 100% rename from config/rootfiles/core/157/filelists/Convert-UUlib rename to config/rootfiles/oldcore/157/filelists/Convert-UUlib diff --git a/config/rootfiles/core/157/filelists/Crypt-PasswdMD5 b/config/rootfiles/oldcore/157/filelists/Crypt-PasswdMD5 similarity index 100% rename from config/rootfiles/core/157/filelists/Crypt-PasswdMD5 rename to config/rootfiles/oldcore/157/filelists/Crypt-PasswdMD5 diff --git a/config/rootfiles/core/157/filelists/Digest b/config/rootfiles/oldcore/157/filelists/Digest similarity index 100% rename from config/rootfiles/core/157/filelists/Digest rename to config/rootfiles/oldcore/157/filelists/Digest diff --git a/config/rootfiles/core/157/filelists/aarch64/linux b/config/rootfiles/oldcore/157/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/157/filelists/aarch64/linux rename to config/rootfiles/oldcore/157/filelists/aarch64/linux diff --git a/config/rootfiles/core/157/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/157/filelists/aarch64/linux-initrd similarity index 100% rename from config/rootfiles/core/157/filelists/aarch64/linux-initrd rename to config/rootfiles/oldcore/157/filelists/aarch64/linux-initrd diff --git a/config/rootfiles/core/157/filelists/aarch64/lm_sensors b/config/rootfiles/oldcore/157/filelists/aarch64/lm_sensors similarity index 100% rename from config/rootfiles/core/157/filelists/aarch64/lm_sensors rename to config/rootfiles/oldcore/157/filelists/aarch64/lm_sensors diff --git a/config/rootfiles/core/157/filelists/apache2 b/config/rootfiles/oldcore/157/filelists/apache2 similarity index 100% rename from config/rootfiles/core/157/filelists/apache2 rename to config/rootfiles/oldcore/157/filelists/apache2 diff --git a/config/rootfiles/core/157/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/oldcore/157/filelists/armv5tel/linux-initrd-multi similarity index 100% rename from config/rootfiles/core/157/filelists/armv5tel/linux-initrd-multi rename to config/rootfiles/oldcore/157/filelists/armv5tel/linux-initrd-multi diff --git a/config/rootfiles/core/157/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/157/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/157/filelists/armv5tel/linux-multi rename to config/rootfiles/oldcore/157/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/157/filelists/armv5tel/lm_sensors b/config/rootfiles/oldcore/157/filelists/armv5tel/lm_sensors similarity index 100% rename from config/rootfiles/core/157/filelists/armv5tel/lm_sensors rename to config/rootfiles/oldcore/157/filelists/armv5tel/lm_sensors diff --git a/config/rootfiles/core/157/filelists/bash b/config/rootfiles/oldcore/157/filelists/bash similarity index 100% rename from config/rootfiles/core/157/filelists/bash rename to config/rootfiles/oldcore/157/filelists/bash diff --git a/config/rootfiles/core/157/filelists/boost b/config/rootfiles/oldcore/157/filelists/boost similarity index 100% rename from config/rootfiles/core/157/filelists/boost rename to config/rootfiles/oldcore/157/filelists/boost diff --git a/config/rootfiles/core/157/filelists/collectd b/config/rootfiles/oldcore/157/filelists/collectd similarity index 100% rename from config/rootfiles/core/157/filelists/collectd rename to config/rootfiles/oldcore/157/filelists/collectd diff --git a/config/rootfiles/core/157/filelists/curl b/config/rootfiles/oldcore/157/filelists/curl similarity index 100% rename from config/rootfiles/core/157/filelists/curl rename to config/rootfiles/oldcore/157/filelists/curl diff --git a/config/rootfiles/core/157/filelists/ddns b/config/rootfiles/oldcore/157/filelists/ddns similarity index 100% rename from config/rootfiles/core/157/filelists/ddns rename to config/rootfiles/oldcore/157/filelists/ddns diff --git a/config/rootfiles/core/157/filelists/dejavu-fonts-ttf b/config/rootfiles/oldcore/157/filelists/dejavu-fonts-ttf similarity index 100% rename from config/rootfiles/core/157/filelists/dejavu-fonts-ttf rename to config/rootfiles/oldcore/157/filelists/dejavu-fonts-ttf diff --git a/config/rootfiles/core/157/filelists/expat b/config/rootfiles/oldcore/157/filelists/expat similarity index 100% rename from config/rootfiles/core/157/filelists/expat rename to config/rootfiles/oldcore/157/filelists/expat diff --git a/config/rootfiles/core/157/filelists/file b/config/rootfiles/oldcore/157/filelists/file similarity index 100% rename from config/rootfiles/core/157/filelists/file rename to config/rootfiles/oldcore/157/filelists/file diff --git a/config/rootfiles/core/157/filelists/files b/config/rootfiles/oldcore/157/filelists/files similarity index 100% rename from config/rootfiles/core/157/filelists/files rename to config/rootfiles/oldcore/157/filelists/files diff --git a/config/rootfiles/core/157/filelists/fuse b/config/rootfiles/oldcore/157/filelists/fuse similarity index 100% rename from config/rootfiles/core/157/filelists/fuse rename to config/rootfiles/oldcore/157/filelists/fuse diff --git a/config/rootfiles/core/157/filelists/glib b/config/rootfiles/oldcore/157/filelists/glib similarity index 100% rename from config/rootfiles/core/157/filelists/glib rename to config/rootfiles/oldcore/157/filelists/glib diff --git a/config/rootfiles/core/157/filelists/i586/linux b/config/rootfiles/oldcore/157/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/157/filelists/i586/linux rename to config/rootfiles/oldcore/157/filelists/i586/linux diff --git a/config/rootfiles/core/157/filelists/i586/linux-initrd b/config/rootfiles/oldcore/157/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/157/filelists/i586/linux-initrd rename to config/rootfiles/oldcore/157/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/157/filelists/i586/lm_sensors b/config/rootfiles/oldcore/157/filelists/i586/lm_sensors similarity index 100% rename from config/rootfiles/core/157/filelists/i586/lm_sensors rename to config/rootfiles/oldcore/157/filelists/i586/lm_sensors diff --git a/config/rootfiles/core/157/filelists/iproute2 b/config/rootfiles/oldcore/157/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/157/filelists/iproute2 rename to config/rootfiles/oldcore/157/filelists/iproute2 diff --git a/config/rootfiles/core/157/filelists/iputils b/config/rootfiles/oldcore/157/filelists/iputils similarity index 100% rename from config/rootfiles/core/157/filelists/iputils rename to config/rootfiles/oldcore/157/filelists/iputils diff --git a/config/rootfiles/core/157/filelists/less b/config/rootfiles/oldcore/157/filelists/less similarity index 100% rename from config/rootfiles/core/157/filelists/less rename to config/rootfiles/oldcore/157/filelists/less diff --git a/config/rootfiles/core/157/filelists/libaio b/config/rootfiles/oldcore/157/filelists/libaio similarity index 100% rename from config/rootfiles/core/157/filelists/libaio rename to config/rootfiles/oldcore/157/filelists/libaio diff --git a/config/rootfiles/core/157/filelists/libarchive b/config/rootfiles/oldcore/157/filelists/libarchive similarity index 100% rename from config/rootfiles/core/157/filelists/libarchive rename to config/rootfiles/oldcore/157/filelists/libarchive diff --git a/config/rootfiles/core/157/filelists/libcap-ng b/config/rootfiles/oldcore/157/filelists/libcap-ng similarity index 100% rename from config/rootfiles/core/157/filelists/libcap-ng rename to config/rootfiles/oldcore/157/filelists/libcap-ng diff --git a/config/rootfiles/core/157/filelists/libedit b/config/rootfiles/oldcore/157/filelists/libedit similarity index 100% rename from config/rootfiles/core/157/filelists/libedit rename to config/rootfiles/oldcore/157/filelists/libedit diff --git a/config/rootfiles/core/157/filelists/libevent2 b/config/rootfiles/oldcore/157/filelists/libevent2 similarity index 100% rename from config/rootfiles/core/157/filelists/libevent2 rename to config/rootfiles/oldcore/157/filelists/libevent2 diff --git a/config/rootfiles/core/157/filelists/libgcrypt b/config/rootfiles/oldcore/157/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/157/filelists/libgcrypt rename to config/rootfiles/oldcore/157/filelists/libgcrypt diff --git a/config/rootfiles/core/157/filelists/libgpg-error b/config/rootfiles/oldcore/157/filelists/libgpg-error similarity index 100% rename from config/rootfiles/core/157/filelists/libgpg-error rename to config/rootfiles/oldcore/157/filelists/libgpg-error diff --git a/config/rootfiles/core/157/filelists/libjpeg b/config/rootfiles/oldcore/157/filelists/libjpeg similarity index 100% rename from config/rootfiles/core/157/filelists/libjpeg rename to config/rootfiles/oldcore/157/filelists/libjpeg diff --git a/config/rootfiles/core/157/filelists/libupnp b/config/rootfiles/oldcore/157/filelists/libupnp similarity index 100% rename from config/rootfiles/core/157/filelists/libupnp rename to config/rootfiles/oldcore/157/filelists/libupnp diff --git a/config/rootfiles/core/157/filelists/libxcrypt b/config/rootfiles/oldcore/157/filelists/libxcrypt similarity index 100% rename from config/rootfiles/core/157/filelists/libxcrypt rename to config/rootfiles/oldcore/157/filelists/libxcrypt diff --git a/config/rootfiles/core/157/filelists/libxml2 b/config/rootfiles/oldcore/157/filelists/libxml2 similarity index 100% rename from config/rootfiles/core/157/filelists/libxml2 rename to config/rootfiles/oldcore/157/filelists/libxml2 diff --git a/config/rootfiles/core/157/filelists/libxslt b/config/rootfiles/oldcore/157/filelists/libxslt similarity index 100% rename from config/rootfiles/core/157/filelists/libxslt rename to config/rootfiles/oldcore/157/filelists/libxslt diff --git a/config/rootfiles/core/157/filelists/newt b/config/rootfiles/oldcore/157/filelists/newt similarity index 100% rename from config/rootfiles/core/157/filelists/newt rename to config/rootfiles/oldcore/157/filelists/newt diff --git a/config/rootfiles/core/157/filelists/openssh b/config/rootfiles/oldcore/157/filelists/openssh similarity index 100% rename from config/rootfiles/core/157/filelists/openssh rename to config/rootfiles/oldcore/157/filelists/openssh diff --git a/config/rootfiles/core/157/filelists/pixman b/config/rootfiles/oldcore/157/filelists/pixman similarity index 100% rename from config/rootfiles/core/157/filelists/pixman rename to config/rootfiles/oldcore/157/filelists/pixman diff --git a/config/rootfiles/core/157/filelists/poppler b/config/rootfiles/oldcore/157/filelists/poppler similarity index 100% rename from config/rootfiles/core/157/filelists/poppler rename to config/rootfiles/oldcore/157/filelists/poppler diff --git a/config/rootfiles/core/157/filelists/poppler-data b/config/rootfiles/oldcore/157/filelists/poppler-data similarity index 100% rename from config/rootfiles/core/157/filelists/poppler-data rename to config/rootfiles/oldcore/157/filelists/poppler-data diff --git a/config/rootfiles/core/157/filelists/ppp b/config/rootfiles/oldcore/157/filelists/ppp similarity index 100% rename from config/rootfiles/core/157/filelists/ppp rename to config/rootfiles/oldcore/157/filelists/ppp diff --git a/config/rootfiles/core/157/filelists/python3-daemon b/config/rootfiles/oldcore/157/filelists/python3-daemon similarity index 100% rename from config/rootfiles/core/157/filelists/python3-daemon rename to config/rootfiles/oldcore/157/filelists/python3-daemon diff --git a/config/rootfiles/core/157/filelists/readline b/config/rootfiles/oldcore/157/filelists/readline similarity index 100% rename from config/rootfiles/core/157/filelists/readline rename to config/rootfiles/oldcore/157/filelists/readline diff --git a/config/rootfiles/oldcore/157/filelists/release-files b/config/rootfiles/oldcore/157/filelists/release-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/oldcore/157/filelists/release-files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/os-release +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/157/filelists/sqlite b/config/rootfiles/oldcore/157/filelists/sqlite similarity index 100% rename from config/rootfiles/core/157/filelists/sqlite rename to config/rootfiles/oldcore/157/filelists/sqlite diff --git a/config/rootfiles/core/157/filelists/squid b/config/rootfiles/oldcore/157/filelists/squid similarity index 100% rename from config/rootfiles/core/157/filelists/squid rename to config/rootfiles/oldcore/157/filelists/squid diff --git a/config/rootfiles/core/157/filelists/sudo b/config/rootfiles/oldcore/157/filelists/sudo similarity index 100% rename from config/rootfiles/core/157/filelists/sudo rename to config/rootfiles/oldcore/157/filelists/sudo diff --git a/config/rootfiles/core/157/filelists/x86_64/linux b/config/rootfiles/oldcore/157/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/157/filelists/x86_64/linux rename to config/rootfiles/oldcore/157/filelists/x86_64/linux diff --git a/config/rootfiles/core/157/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/157/filelists/x86_64/linux-initrd similarity index 100% rename from config/rootfiles/core/157/filelists/x86_64/linux-initrd rename to config/rootfiles/oldcore/157/filelists/x86_64/linux-initrd diff --git a/config/rootfiles/core/157/filelists/x86_64/lm_sensors b/config/rootfiles/oldcore/157/filelists/x86_64/lm_sensors similarity index 100% rename from config/rootfiles/core/157/filelists/x86_64/lm_sensors rename to config/rootfiles/oldcore/157/filelists/x86_64/lm_sensors diff --git a/config/rootfiles/core/157/filelists/xfsprogs b/config/rootfiles/oldcore/157/filelists/xfsprogs similarity index 100% rename from config/rootfiles/core/157/filelists/xfsprogs rename to config/rootfiles/oldcore/157/filelists/xfsprogs diff --git a/config/rootfiles/core/157/update.sh b/config/rootfiles/oldcore/157/update.sh similarity index 100% rename from config/rootfiles/core/157/update.sh rename to config/rootfiles/oldcore/157/update.sh diff --git a/make.sh b/make.sh index 4af0081e94..973e3b244e 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="157" # Core Level (Filename) +CORE="158" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop -- 2.39.2