From: Peter Müller Date: Sat, 25 Jun 2022 11:07:09 +0000 (+0000) Subject: Start Core Update 170 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f653df852ad45a19e686c0c8d833a1fcbfd4faac;p=people%2Fstevee%2Fipfire-2.x.git Start Core Update 170 Signed-off-by: Peter Müller --- diff --git a/config/rootfiles/core/169/core-files b/config/rootfiles/core/170/core-files similarity index 100% rename from config/rootfiles/core/169/core-files rename to config/rootfiles/core/170/core-files diff --git a/config/rootfiles/core/169/exclude b/config/rootfiles/core/170/exclude similarity index 100% rename from config/rootfiles/core/169/exclude rename to config/rootfiles/core/170/exclude diff --git a/config/rootfiles/core/169/filelists/core-files b/config/rootfiles/core/170/filelists/core-files similarity index 100% rename from config/rootfiles/core/169/filelists/core-files rename to config/rootfiles/core/170/filelists/core-files diff --git a/config/rootfiles/core/170/filelists/files b/config/rootfiles/core/170/filelists/files new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh new file mode 100644 index 0000000000..8edb5ff2ee --- /dev/null +++ b/config/rootfiles/core/170/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) 2022 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=170 + +# 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 + +# Remove files + +# 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/169/core-files b/config/rootfiles/oldcore/169/core-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/oldcore/169/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/oldcore/169/exclude b/config/rootfiles/oldcore/169/exclude new file mode 100644 index 0000000000..b22e5e943c --- /dev/null +++ b/config/rootfiles/oldcore/169/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/169/filelists/aarch64/binutils b/config/rootfiles/oldcore/169/filelists/aarch64/binutils similarity index 100% rename from config/rootfiles/core/169/filelists/aarch64/binutils rename to config/rootfiles/oldcore/169/filelists/aarch64/binutils diff --git a/config/rootfiles/core/169/filelists/aarch64/gcc b/config/rootfiles/oldcore/169/filelists/aarch64/gcc similarity index 100% rename from config/rootfiles/core/169/filelists/aarch64/gcc rename to config/rootfiles/oldcore/169/filelists/aarch64/gcc diff --git a/config/rootfiles/core/169/filelists/aarch64/glibc b/config/rootfiles/oldcore/169/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/169/filelists/aarch64/glibc rename to config/rootfiles/oldcore/169/filelists/aarch64/glibc diff --git a/config/rootfiles/core/169/filelists/aarch64/linux b/config/rootfiles/oldcore/169/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/169/filelists/aarch64/linux rename to config/rootfiles/oldcore/169/filelists/aarch64/linux diff --git a/config/rootfiles/core/169/filelists/aarch64/u-boot b/config/rootfiles/oldcore/169/filelists/aarch64/u-boot similarity index 100% rename from config/rootfiles/core/169/filelists/aarch64/u-boot rename to config/rootfiles/oldcore/169/filelists/aarch64/u-boot diff --git a/config/rootfiles/core/169/filelists/apache2 b/config/rootfiles/oldcore/169/filelists/apache2 similarity index 100% rename from config/rootfiles/core/169/filelists/apache2 rename to config/rootfiles/oldcore/169/filelists/apache2 diff --git a/config/rootfiles/core/169/filelists/armv6l/binutils b/config/rootfiles/oldcore/169/filelists/armv6l/binutils similarity index 100% rename from config/rootfiles/core/169/filelists/armv6l/binutils rename to config/rootfiles/oldcore/169/filelists/armv6l/binutils diff --git a/config/rootfiles/core/169/filelists/armv6l/gcc b/config/rootfiles/oldcore/169/filelists/armv6l/gcc similarity index 100% rename from config/rootfiles/core/169/filelists/armv6l/gcc rename to config/rootfiles/oldcore/169/filelists/armv6l/gcc diff --git a/config/rootfiles/core/169/filelists/armv6l/glibc b/config/rootfiles/oldcore/169/filelists/armv6l/glibc similarity index 100% rename from config/rootfiles/core/169/filelists/armv6l/glibc rename to config/rootfiles/oldcore/169/filelists/armv6l/glibc diff --git a/config/rootfiles/core/169/filelists/armv6l/linux b/config/rootfiles/oldcore/169/filelists/armv6l/linux similarity index 100% rename from config/rootfiles/core/169/filelists/armv6l/linux rename to config/rootfiles/oldcore/169/filelists/armv6l/linux diff --git a/config/rootfiles/core/169/filelists/armv6l/u-boot b/config/rootfiles/oldcore/169/filelists/armv6l/u-boot similarity index 100% rename from config/rootfiles/core/169/filelists/armv6l/u-boot rename to config/rootfiles/oldcore/169/filelists/armv6l/u-boot diff --git a/config/rootfiles/core/169/filelists/bind b/config/rootfiles/oldcore/169/filelists/bind similarity index 100% rename from config/rootfiles/core/169/filelists/bind rename to config/rootfiles/oldcore/169/filelists/bind diff --git a/config/rootfiles/oldcore/169/filelists/core-files b/config/rootfiles/oldcore/169/filelists/core-files new file mode 120000 index 0000000000..709d6c14cb --- /dev/null +++ b/config/rootfiles/oldcore/169/filelists/core-files @@ -0,0 +1 @@ +../core-files \ No newline at end of file diff --git a/config/rootfiles/core/169/filelists/curl b/config/rootfiles/oldcore/169/filelists/curl similarity index 100% rename from config/rootfiles/core/169/filelists/curl rename to config/rootfiles/oldcore/169/filelists/curl diff --git a/config/rootfiles/core/169/filelists/files b/config/rootfiles/oldcore/169/filelists/files similarity index 100% rename from config/rootfiles/core/169/filelists/files rename to config/rootfiles/oldcore/169/filelists/files diff --git a/config/rootfiles/core/169/filelists/fuse b/config/rootfiles/oldcore/169/filelists/fuse similarity index 100% rename from config/rootfiles/core/169/filelists/fuse rename to config/rootfiles/oldcore/169/filelists/fuse diff --git a/config/rootfiles/core/169/filelists/iptables b/config/rootfiles/oldcore/169/filelists/iptables similarity index 100% rename from config/rootfiles/core/169/filelists/iptables rename to config/rootfiles/oldcore/169/filelists/iptables diff --git a/config/rootfiles/core/169/filelists/keyutils b/config/rootfiles/oldcore/169/filelists/keyutils similarity index 100% rename from config/rootfiles/core/169/filelists/keyutils rename to config/rootfiles/oldcore/169/filelists/keyutils diff --git a/config/rootfiles/core/169/filelists/krb5 b/config/rootfiles/oldcore/169/filelists/krb5 similarity index 100% rename from config/rootfiles/core/169/filelists/krb5 rename to config/rootfiles/oldcore/169/filelists/krb5 diff --git a/config/rootfiles/core/169/filelists/libnetfilter_cthelper b/config/rootfiles/oldcore/169/filelists/libnetfilter_cthelper similarity index 100% rename from config/rootfiles/core/169/filelists/libnetfilter_cthelper rename to config/rootfiles/oldcore/169/filelists/libnetfilter_cthelper diff --git a/config/rootfiles/core/169/filelists/libnetfilter_cttimeout b/config/rootfiles/oldcore/169/filelists/libnetfilter_cttimeout similarity index 100% rename from config/rootfiles/core/169/filelists/libnetfilter_cttimeout rename to config/rootfiles/oldcore/169/filelists/libnetfilter_cttimeout diff --git a/config/rootfiles/core/169/filelists/libtiff b/config/rootfiles/oldcore/169/filelists/libtiff similarity index 100% rename from config/rootfiles/core/169/filelists/libtiff rename to config/rootfiles/oldcore/169/filelists/libtiff diff --git a/config/rootfiles/core/169/filelists/libxml2 b/config/rootfiles/oldcore/169/filelists/libxml2 similarity index 100% rename from config/rootfiles/core/169/filelists/libxml2 rename to config/rootfiles/oldcore/169/filelists/libxml2 diff --git a/config/rootfiles/core/169/filelists/libxslt b/config/rootfiles/oldcore/169/filelists/libxslt similarity index 100% rename from config/rootfiles/core/169/filelists/libxslt rename to config/rootfiles/oldcore/169/filelists/libxslt diff --git a/config/rootfiles/core/169/filelists/libyang b/config/rootfiles/oldcore/169/filelists/libyang similarity index 100% rename from config/rootfiles/core/169/filelists/libyang rename to config/rootfiles/oldcore/169/filelists/libyang diff --git a/config/rootfiles/core/169/filelists/lmdb b/config/rootfiles/oldcore/169/filelists/lmdb similarity index 100% rename from config/rootfiles/core/169/filelists/lmdb rename to config/rootfiles/oldcore/169/filelists/lmdb diff --git a/config/rootfiles/core/169/filelists/logrotate b/config/rootfiles/oldcore/169/filelists/logrotate similarity index 100% rename from config/rootfiles/core/169/filelists/logrotate rename to config/rootfiles/oldcore/169/filelists/logrotate diff --git a/config/rootfiles/core/169/filelists/lzip b/config/rootfiles/oldcore/169/filelists/lzip similarity index 100% rename from config/rootfiles/core/169/filelists/lzip rename to config/rootfiles/oldcore/169/filelists/lzip diff --git a/config/rootfiles/core/169/filelists/misc-progs b/config/rootfiles/oldcore/169/filelists/misc-progs similarity index 100% rename from config/rootfiles/core/169/filelists/misc-progs rename to config/rootfiles/oldcore/169/filelists/misc-progs diff --git a/config/rootfiles/core/169/filelists/oath-toolkit b/config/rootfiles/oldcore/169/filelists/oath-toolkit similarity index 100% rename from config/rootfiles/core/169/filelists/oath-toolkit rename to config/rootfiles/oldcore/169/filelists/oath-toolkit diff --git a/config/rootfiles/core/169/filelists/openssl b/config/rootfiles/oldcore/169/filelists/openssl similarity index 100% rename from config/rootfiles/core/169/filelists/openssl rename to config/rootfiles/oldcore/169/filelists/openssl diff --git a/config/rootfiles/core/169/filelists/openvpn b/config/rootfiles/oldcore/169/filelists/openvpn similarity index 100% rename from config/rootfiles/core/169/filelists/openvpn rename to config/rootfiles/oldcore/169/filelists/openvpn diff --git a/config/rootfiles/core/169/filelists/perl-File-Remove b/config/rootfiles/oldcore/169/filelists/perl-File-Remove similarity index 100% rename from config/rootfiles/core/169/filelists/perl-File-Remove rename to config/rootfiles/oldcore/169/filelists/perl-File-Remove diff --git a/config/rootfiles/core/169/filelists/perl-Imager b/config/rootfiles/oldcore/169/filelists/perl-Imager similarity index 100% rename from config/rootfiles/core/169/filelists/perl-Imager rename to config/rootfiles/oldcore/169/filelists/perl-Imager diff --git a/config/rootfiles/core/169/filelists/perl-Imager-QRCode b/config/rootfiles/oldcore/169/filelists/perl-Imager-QRCode similarity index 100% rename from config/rootfiles/core/169/filelists/perl-Imager-QRCode rename to config/rootfiles/oldcore/169/filelists/perl-Imager-QRCode diff --git a/config/rootfiles/core/169/filelists/perl-MIME-Base32 b/config/rootfiles/oldcore/169/filelists/perl-MIME-Base32 similarity index 100% rename from config/rootfiles/core/169/filelists/perl-MIME-Base32 rename to config/rootfiles/oldcore/169/filelists/perl-MIME-Base32 diff --git a/config/rootfiles/core/169/filelists/perl-Module-Build b/config/rootfiles/oldcore/169/filelists/perl-Module-Build similarity index 100% rename from config/rootfiles/core/169/filelists/perl-Module-Build rename to config/rootfiles/oldcore/169/filelists/perl-Module-Build diff --git a/config/rootfiles/core/169/filelists/perl-Module-Install b/config/rootfiles/oldcore/169/filelists/perl-Module-Install similarity index 100% rename from config/rootfiles/core/169/filelists/perl-Module-Install rename to config/rootfiles/oldcore/169/filelists/perl-Module-Install diff --git a/config/rootfiles/core/169/filelists/perl-Module-ScanDeps b/config/rootfiles/oldcore/169/filelists/perl-Module-ScanDeps similarity index 100% rename from config/rootfiles/core/169/filelists/perl-Module-ScanDeps rename to config/rootfiles/oldcore/169/filelists/perl-Module-ScanDeps diff --git a/config/rootfiles/core/169/filelists/perl-URI-Encode b/config/rootfiles/oldcore/169/filelists/perl-URI-Encode similarity index 100% rename from config/rootfiles/core/169/filelists/perl-URI-Encode rename to config/rootfiles/oldcore/169/filelists/perl-URI-Encode diff --git a/config/rootfiles/core/169/filelists/perl-YAML-Tiny b/config/rootfiles/oldcore/169/filelists/perl-YAML-Tiny similarity index 100% rename from config/rootfiles/core/169/filelists/perl-YAML-Tiny rename to config/rootfiles/oldcore/169/filelists/perl-YAML-Tiny diff --git a/config/rootfiles/core/169/filelists/poppler b/config/rootfiles/oldcore/169/filelists/poppler similarity index 100% rename from config/rootfiles/core/169/filelists/poppler rename to config/rootfiles/oldcore/169/filelists/poppler diff --git a/config/rootfiles/core/169/filelists/qrencode b/config/rootfiles/oldcore/169/filelists/qrencode similarity index 100% rename from config/rootfiles/core/169/filelists/qrencode rename to config/rootfiles/oldcore/169/filelists/qrencode diff --git a/config/rootfiles/core/169/filelists/sqlite b/config/rootfiles/oldcore/169/filelists/sqlite similarity index 100% rename from config/rootfiles/core/169/filelists/sqlite rename to config/rootfiles/oldcore/169/filelists/sqlite diff --git a/config/rootfiles/core/169/filelists/squid b/config/rootfiles/oldcore/169/filelists/squid similarity index 100% rename from config/rootfiles/core/169/filelists/squid rename to config/rootfiles/oldcore/169/filelists/squid diff --git a/config/rootfiles/core/169/filelists/tzdata b/config/rootfiles/oldcore/169/filelists/tzdata similarity index 100% rename from config/rootfiles/core/169/filelists/tzdata rename to config/rootfiles/oldcore/169/filelists/tzdata diff --git a/config/rootfiles/core/169/filelists/unbound b/config/rootfiles/oldcore/169/filelists/unbound similarity index 100% rename from config/rootfiles/core/169/filelists/unbound rename to config/rootfiles/oldcore/169/filelists/unbound diff --git a/config/rootfiles/core/169/filelists/x86_64/binutils b/config/rootfiles/oldcore/169/filelists/x86_64/binutils similarity index 100% rename from config/rootfiles/core/169/filelists/x86_64/binutils rename to config/rootfiles/oldcore/169/filelists/x86_64/binutils diff --git a/config/rootfiles/core/169/filelists/x86_64/gcc b/config/rootfiles/oldcore/169/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/169/filelists/x86_64/gcc rename to config/rootfiles/oldcore/169/filelists/x86_64/gcc diff --git a/config/rootfiles/core/169/filelists/x86_64/glibc b/config/rootfiles/oldcore/169/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/169/filelists/x86_64/glibc rename to config/rootfiles/oldcore/169/filelists/x86_64/glibc diff --git a/config/rootfiles/core/169/filelists/x86_64/linux b/config/rootfiles/oldcore/169/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/169/filelists/x86_64/linux rename to config/rootfiles/oldcore/169/filelists/x86_64/linux diff --git a/config/rootfiles/core/169/filelists/xfsprogs b/config/rootfiles/oldcore/169/filelists/xfsprogs similarity index 100% rename from config/rootfiles/core/169/filelists/xfsprogs rename to config/rootfiles/oldcore/169/filelists/xfsprogs diff --git a/config/rootfiles/core/169/update.sh b/config/rootfiles/oldcore/169/update.sh similarity index 100% rename from config/rootfiles/core/169/update.sh rename to config/rootfiles/oldcore/169/update.sh