From: Peter Müller Date: Sun, 10 Apr 2022 09:42:56 +0000 (+0000) Subject: Start Core Update 168 X-Git-Tag: v2.27-core170~304^2~80 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77c3824f285e7df66ce4a26be11dc336bc17633d;p=ipfire-2.x.git Start Core Update 168 Signed-off-by: Peter Müller --- diff --git a/config/rootfiles/core/167/filelists/core-files b/config/rootfiles/core/168/core-files similarity index 100% rename from config/rootfiles/core/167/filelists/core-files rename to config/rootfiles/core/168/core-files diff --git a/config/rootfiles/core/167/exclude b/config/rootfiles/core/168/exclude similarity index 100% rename from config/rootfiles/core/167/exclude rename to config/rootfiles/core/168/exclude diff --git a/config/rootfiles/core/168/filelists/files b/config/rootfiles/core/168/filelists/files new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/168/update.sh b/config/rootfiles/core/168/update.sh new file mode 100644 index 0000000000..bb289d5af9 --- /dev/null +++ b/config/rootfiles/core/168/update.sh @@ -0,0 +1,65 @@ +#!/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) 2022 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=168 + +# 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 + +# 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/167/exclude b/config/rootfiles/oldcore/167/exclude new file mode 100644 index 0000000000..b22e5e943c --- /dev/null +++ b/config/rootfiles/oldcore/167/exclude @@ -0,0 +1,35 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +boot/uEnv.txt +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/167/filelists/aarch64/linux b/config/rootfiles/oldcore/167/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/167/filelists/aarch64/linux rename to config/rootfiles/oldcore/167/filelists/aarch64/linux diff --git a/config/rootfiles/core/167/filelists/aarch64/u-boot b/config/rootfiles/oldcore/167/filelists/aarch64/u-boot similarity index 100% rename from config/rootfiles/core/167/filelists/aarch64/u-boot rename to config/rootfiles/oldcore/167/filelists/aarch64/u-boot diff --git a/config/rootfiles/core/167/filelists/aarch64/util-linux b/config/rootfiles/oldcore/167/filelists/aarch64/util-linux similarity index 100% rename from config/rootfiles/core/167/filelists/aarch64/util-linux rename to config/rootfiles/oldcore/167/filelists/aarch64/util-linux diff --git a/config/rootfiles/core/167/filelists/apache2 b/config/rootfiles/oldcore/167/filelists/apache2 similarity index 100% rename from config/rootfiles/core/167/filelists/apache2 rename to config/rootfiles/oldcore/167/filelists/apache2 diff --git a/config/rootfiles/core/167/filelists/armv6l/linux b/config/rootfiles/oldcore/167/filelists/armv6l/linux similarity index 100% rename from config/rootfiles/core/167/filelists/armv6l/linux rename to config/rootfiles/oldcore/167/filelists/armv6l/linux diff --git a/config/rootfiles/core/167/filelists/armv6l/util-linux b/config/rootfiles/oldcore/167/filelists/armv6l/util-linux similarity index 100% rename from config/rootfiles/core/167/filelists/armv6l/util-linux rename to config/rootfiles/oldcore/167/filelists/armv6l/util-linux diff --git a/config/rootfiles/core/167/filelists/bind b/config/rootfiles/oldcore/167/filelists/bind similarity index 100% rename from config/rootfiles/core/167/filelists/bind rename to config/rootfiles/oldcore/167/filelists/bind diff --git a/config/rootfiles/core/167/filelists/ca-certificates b/config/rootfiles/oldcore/167/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/167/filelists/ca-certificates rename to config/rootfiles/oldcore/167/filelists/ca-certificates diff --git a/config/rootfiles/oldcore/167/filelists/core-files b/config/rootfiles/oldcore/167/filelists/core-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/oldcore/167/filelists/core-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/167/filelists/coreutils b/config/rootfiles/oldcore/167/filelists/coreutils similarity index 100% rename from config/rootfiles/core/167/filelists/coreutils rename to config/rootfiles/oldcore/167/filelists/coreutils diff --git a/config/rootfiles/core/167/filelists/curl b/config/rootfiles/oldcore/167/filelists/curl similarity index 100% rename from config/rootfiles/core/167/filelists/curl rename to config/rootfiles/oldcore/167/filelists/curl diff --git a/config/rootfiles/core/167/filelists/ddns b/config/rootfiles/oldcore/167/filelists/ddns similarity index 100% rename from config/rootfiles/core/167/filelists/ddns rename to config/rootfiles/oldcore/167/filelists/ddns diff --git a/config/rootfiles/core/167/filelists/dracut b/config/rootfiles/oldcore/167/filelists/dracut similarity index 100% rename from config/rootfiles/core/167/filelists/dracut rename to config/rootfiles/oldcore/167/filelists/dracut diff --git a/config/rootfiles/core/167/filelists/files b/config/rootfiles/oldcore/167/filelists/files similarity index 100% rename from config/rootfiles/core/167/filelists/files rename to config/rootfiles/oldcore/167/filelists/files diff --git a/config/rootfiles/core/167/filelists/gzip b/config/rootfiles/oldcore/167/filelists/gzip similarity index 100% rename from config/rootfiles/core/167/filelists/gzip rename to config/rootfiles/oldcore/167/filelists/gzip diff --git a/config/rootfiles/core/167/filelists/harfbuzz b/config/rootfiles/oldcore/167/filelists/harfbuzz similarity index 100% rename from config/rootfiles/core/167/filelists/harfbuzz rename to config/rootfiles/oldcore/167/filelists/harfbuzz diff --git a/config/rootfiles/core/167/filelists/hwdata b/config/rootfiles/oldcore/167/filelists/hwdata similarity index 100% rename from config/rootfiles/core/167/filelists/hwdata rename to config/rootfiles/oldcore/167/filelists/hwdata diff --git a/config/rootfiles/core/167/filelists/iproute2 b/config/rootfiles/oldcore/167/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/167/filelists/iproute2 rename to config/rootfiles/oldcore/167/filelists/iproute2 diff --git a/config/rootfiles/core/167/filelists/libdnet b/config/rootfiles/oldcore/167/filelists/libdnet similarity index 100% rename from config/rootfiles/core/167/filelists/libdnet rename to config/rootfiles/oldcore/167/filelists/libdnet diff --git a/config/rootfiles/core/167/filelists/misc-progs b/config/rootfiles/oldcore/167/filelists/misc-progs similarity index 100% rename from config/rootfiles/core/167/filelists/misc-progs rename to config/rootfiles/oldcore/167/filelists/misc-progs diff --git a/config/rootfiles/core/167/filelists/nano b/config/rootfiles/oldcore/167/filelists/nano similarity index 100% rename from config/rootfiles/core/167/filelists/nano rename to config/rootfiles/oldcore/167/filelists/nano diff --git a/config/rootfiles/core/167/filelists/ntfs-3g b/config/rootfiles/oldcore/167/filelists/ntfs-3g similarity index 100% rename from config/rootfiles/core/167/filelists/ntfs-3g rename to config/rootfiles/oldcore/167/filelists/ntfs-3g diff --git a/config/rootfiles/core/167/filelists/openssh b/config/rootfiles/oldcore/167/filelists/openssh similarity index 100% rename from config/rootfiles/core/167/filelists/openssh rename to config/rootfiles/oldcore/167/filelists/openssh diff --git a/config/rootfiles/core/167/filelists/openssl b/config/rootfiles/oldcore/167/filelists/openssl similarity index 100% rename from config/rootfiles/core/167/filelists/openssl rename to config/rootfiles/oldcore/167/filelists/openssl diff --git a/config/rootfiles/core/167/filelists/pakfire b/config/rootfiles/oldcore/167/filelists/pakfire similarity index 100% rename from config/rootfiles/core/167/filelists/pakfire rename to config/rootfiles/oldcore/167/filelists/pakfire diff --git a/config/rootfiles/core/167/filelists/pango b/config/rootfiles/oldcore/167/filelists/pango similarity index 100% rename from config/rootfiles/core/167/filelists/pango rename to config/rootfiles/oldcore/167/filelists/pango diff --git a/config/rootfiles/core/167/filelists/perl-CGI b/config/rootfiles/oldcore/167/filelists/perl-CGI similarity index 100% rename from config/rootfiles/core/167/filelists/perl-CGI rename to config/rootfiles/oldcore/167/filelists/perl-CGI diff --git a/config/rootfiles/core/167/filelists/psmisc b/config/rootfiles/oldcore/167/filelists/psmisc similarity index 100% rename from config/rootfiles/core/167/filelists/psmisc rename to config/rootfiles/oldcore/167/filelists/psmisc diff --git a/config/rootfiles/core/167/filelists/rrdtool b/config/rootfiles/oldcore/167/filelists/rrdtool similarity index 100% rename from config/rootfiles/core/167/filelists/rrdtool rename to config/rootfiles/oldcore/167/filelists/rrdtool diff --git a/config/rootfiles/core/167/filelists/smartmontools b/config/rootfiles/oldcore/167/filelists/smartmontools similarity index 100% rename from config/rootfiles/core/167/filelists/smartmontools rename to config/rootfiles/oldcore/167/filelists/smartmontools diff --git a/config/rootfiles/core/167/filelists/sqlite b/config/rootfiles/oldcore/167/filelists/sqlite similarity index 100% rename from config/rootfiles/core/167/filelists/sqlite rename to config/rootfiles/oldcore/167/filelists/sqlite diff --git a/config/rootfiles/core/167/filelists/strongswan b/config/rootfiles/oldcore/167/filelists/strongswan similarity index 100% rename from config/rootfiles/core/167/filelists/strongswan rename to config/rootfiles/oldcore/167/filelists/strongswan diff --git a/config/rootfiles/core/167/filelists/sudo b/config/rootfiles/oldcore/167/filelists/sudo similarity index 100% rename from config/rootfiles/core/167/filelists/sudo rename to config/rootfiles/oldcore/167/filelists/sudo diff --git a/config/rootfiles/core/167/filelists/wget b/config/rootfiles/oldcore/167/filelists/wget similarity index 100% rename from config/rootfiles/core/167/filelists/wget rename to config/rootfiles/oldcore/167/filelists/wget diff --git a/config/rootfiles/core/167/filelists/wireless-regdb b/config/rootfiles/oldcore/167/filelists/wireless-regdb similarity index 100% rename from config/rootfiles/core/167/filelists/wireless-regdb rename to config/rootfiles/oldcore/167/filelists/wireless-regdb diff --git a/config/rootfiles/core/167/filelists/x86_64/linux b/config/rootfiles/oldcore/167/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/167/filelists/x86_64/linux rename to config/rootfiles/oldcore/167/filelists/x86_64/linux diff --git a/config/rootfiles/core/167/filelists/x86_64/util-linux b/config/rootfiles/oldcore/167/filelists/x86_64/util-linux similarity index 100% rename from config/rootfiles/core/167/filelists/x86_64/util-linux rename to config/rootfiles/oldcore/167/filelists/x86_64/util-linux diff --git a/config/rootfiles/core/167/filelists/zlib b/config/rootfiles/oldcore/167/filelists/zlib similarity index 100% rename from config/rootfiles/core/167/filelists/zlib rename to config/rootfiles/oldcore/167/filelists/zlib diff --git a/config/rootfiles/core/167/update.sh b/config/rootfiles/oldcore/167/update.sh similarity index 100% rename from config/rootfiles/core/167/update.sh rename to config/rootfiles/oldcore/167/update.sh