From: Peter Müller Date: Fri, 3 Dec 2021 17:15:43 +0000 (+0100) Subject: Start Core Update 163 X-Git-Tag: v2.27-core163~26^2~103 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8acbce68af2b423ce92efd8ee4b5c042ac92278c;p=ipfire-2.x.git Start Core Update 163 Signed-off-by: Peter Müller --- diff --git a/config/rootfiles/core/163/core-files b/config/rootfiles/core/163/core-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/core/163/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/163/exclude b/config/rootfiles/core/163/exclude new file mode 100644 index 0000000000..818039f4af --- /dev/null +++ b/config/rootfiles/core/163/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/163/files b/config/rootfiles/core/163/files new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/163/update.sh b/config/rootfiles/core/163/update.sh new file mode 100644 index 0000000000..e51dbf0b3d --- /dev/null +++ b/config/rootfiles/core/163/update.sh @@ -0,0 +1,87 @@ +#!/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) 2021 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=163 + +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 + +# 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 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/core/162/exclude b/config/rootfiles/oldcore/162/exclude similarity index 100% rename from config/rootfiles/core/162/exclude rename to config/rootfiles/oldcore/162/exclude diff --git a/config/rootfiles/core/162/filelists/aarch64/linux b/config/rootfiles/oldcore/162/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/162/filelists/aarch64/linux rename to config/rootfiles/oldcore/162/filelists/aarch64/linux diff --git a/config/rootfiles/core/162/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/162/filelists/aarch64/linux-initrd similarity index 100% rename from config/rootfiles/core/162/filelists/aarch64/linux-initrd rename to config/rootfiles/oldcore/162/filelists/aarch64/linux-initrd diff --git a/config/rootfiles/core/162/filelists/aarch64/rpi-firmware b/config/rootfiles/oldcore/162/filelists/aarch64/rpi-firmware similarity index 100% rename from config/rootfiles/core/162/filelists/aarch64/rpi-firmware rename to config/rootfiles/oldcore/162/filelists/aarch64/rpi-firmware diff --git a/config/rootfiles/core/162/filelists/armv6l/linux b/config/rootfiles/oldcore/162/filelists/armv6l/linux similarity index 100% rename from config/rootfiles/core/162/filelists/armv6l/linux rename to config/rootfiles/oldcore/162/filelists/armv6l/linux diff --git a/config/rootfiles/core/162/filelists/armv6l/linux-initrd b/config/rootfiles/oldcore/162/filelists/armv6l/linux-initrd similarity index 100% rename from config/rootfiles/core/162/filelists/armv6l/linux-initrd rename to config/rootfiles/oldcore/162/filelists/armv6l/linux-initrd diff --git a/config/rootfiles/core/162/filelists/armv6l/rpi-firmware b/config/rootfiles/oldcore/162/filelists/armv6l/rpi-firmware similarity index 100% rename from config/rootfiles/core/162/filelists/armv6l/rpi-firmware rename to config/rootfiles/oldcore/162/filelists/armv6l/rpi-firmware diff --git a/config/rootfiles/core/162/filelists/bind b/config/rootfiles/oldcore/162/filelists/bind similarity index 100% rename from config/rootfiles/core/162/filelists/bind rename to config/rootfiles/oldcore/162/filelists/bind diff --git a/config/rootfiles/core/162/filelists/core-files b/config/rootfiles/oldcore/162/filelists/core-files similarity index 100% rename from config/rootfiles/core/162/filelists/core-files rename to config/rootfiles/oldcore/162/filelists/core-files diff --git a/config/rootfiles/core/162/filelists/coreutils b/config/rootfiles/oldcore/162/filelists/coreutils similarity index 100% rename from config/rootfiles/core/162/filelists/coreutils rename to config/rootfiles/oldcore/162/filelists/coreutils diff --git a/config/rootfiles/core/162/filelists/ddns b/config/rootfiles/oldcore/162/filelists/ddns similarity index 100% rename from config/rootfiles/core/162/filelists/ddns rename to config/rootfiles/oldcore/162/filelists/ddns diff --git a/config/rootfiles/core/162/filelists/dhcpcd b/config/rootfiles/oldcore/162/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/162/filelists/dhcpcd rename to config/rootfiles/oldcore/162/filelists/dhcpcd diff --git a/config/rootfiles/core/162/filelists/files b/config/rootfiles/oldcore/162/filelists/files similarity index 100% rename from config/rootfiles/core/162/filelists/files rename to config/rootfiles/oldcore/162/filelists/files diff --git a/config/rootfiles/core/162/filelists/gawk b/config/rootfiles/oldcore/162/filelists/gawk similarity index 100% rename from config/rootfiles/core/162/filelists/gawk rename to config/rootfiles/oldcore/162/filelists/gawk diff --git a/config/rootfiles/core/162/filelists/i586/linux b/config/rootfiles/oldcore/162/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/162/filelists/i586/linux rename to config/rootfiles/oldcore/162/filelists/i586/linux diff --git a/config/rootfiles/core/162/filelists/i586/linux-initrd b/config/rootfiles/oldcore/162/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/162/filelists/i586/linux-initrd rename to config/rootfiles/oldcore/162/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/162/filelists/i586/motd b/config/rootfiles/oldcore/162/filelists/i586/motd similarity index 100% rename from config/rootfiles/core/162/filelists/i586/motd rename to config/rootfiles/oldcore/162/filelists/i586/motd diff --git a/config/rootfiles/core/162/filelists/jansson b/config/rootfiles/oldcore/162/filelists/jansson similarity index 100% rename from config/rootfiles/core/162/filelists/jansson rename to config/rootfiles/oldcore/162/filelists/jansson diff --git a/config/rootfiles/core/162/filelists/knot b/config/rootfiles/oldcore/162/filelists/knot similarity index 100% rename from config/rootfiles/core/162/filelists/knot rename to config/rootfiles/oldcore/162/filelists/knot diff --git a/config/rootfiles/core/162/filelists/libffi b/config/rootfiles/oldcore/162/filelists/libffi similarity index 100% rename from config/rootfiles/core/162/filelists/libffi rename to config/rootfiles/oldcore/162/filelists/libffi diff --git a/config/rootfiles/core/162/filelists/libhtp b/config/rootfiles/oldcore/162/filelists/libhtp similarity index 100% rename from config/rootfiles/core/162/filelists/libhtp rename to config/rootfiles/oldcore/162/filelists/libhtp diff --git a/config/rootfiles/core/162/filelists/libloc b/config/rootfiles/oldcore/162/filelists/libloc similarity index 100% rename from config/rootfiles/core/162/filelists/libloc rename to config/rootfiles/oldcore/162/filelists/libloc diff --git a/config/rootfiles/core/162/filelists/libuv b/config/rootfiles/oldcore/162/filelists/libuv similarity index 100% rename from config/rootfiles/core/162/filelists/libuv rename to config/rootfiles/oldcore/162/filelists/libuv diff --git a/config/rootfiles/core/162/filelists/libxcrypt b/config/rootfiles/oldcore/162/filelists/libxcrypt similarity index 100% rename from config/rootfiles/core/162/filelists/libxcrypt rename to config/rootfiles/oldcore/162/filelists/libxcrypt diff --git a/config/rootfiles/core/162/filelists/openssh b/config/rootfiles/oldcore/162/filelists/openssh similarity index 100% rename from config/rootfiles/core/162/filelists/openssh rename to config/rootfiles/oldcore/162/filelists/openssh diff --git a/config/rootfiles/core/162/filelists/openvpn b/config/rootfiles/oldcore/162/filelists/openvpn similarity index 100% rename from config/rootfiles/core/162/filelists/openvpn rename to config/rootfiles/oldcore/162/filelists/openvpn diff --git a/config/rootfiles/core/162/filelists/slang b/config/rootfiles/oldcore/162/filelists/slang similarity index 100% rename from config/rootfiles/core/162/filelists/slang rename to config/rootfiles/oldcore/162/filelists/slang diff --git a/config/rootfiles/core/162/filelists/sshfs b/config/rootfiles/oldcore/162/filelists/sshfs similarity index 100% rename from config/rootfiles/core/162/filelists/sshfs rename to config/rootfiles/oldcore/162/filelists/sshfs diff --git a/config/rootfiles/core/162/filelists/suricata b/config/rootfiles/oldcore/162/filelists/suricata similarity index 100% rename from config/rootfiles/core/162/filelists/suricata rename to config/rootfiles/oldcore/162/filelists/suricata diff --git a/config/rootfiles/core/162/filelists/unbound b/config/rootfiles/oldcore/162/filelists/unbound similarity index 100% rename from config/rootfiles/core/162/filelists/unbound rename to config/rootfiles/oldcore/162/filelists/unbound diff --git a/config/rootfiles/core/162/filelists/whois b/config/rootfiles/oldcore/162/filelists/whois similarity index 100% rename from config/rootfiles/core/162/filelists/whois rename to config/rootfiles/oldcore/162/filelists/whois diff --git a/config/rootfiles/core/162/filelists/x86_64/linux b/config/rootfiles/oldcore/162/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/162/filelists/x86_64/linux rename to config/rootfiles/oldcore/162/filelists/x86_64/linux diff --git a/config/rootfiles/core/162/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/162/filelists/x86_64/linux-initrd similarity index 100% rename from config/rootfiles/core/162/filelists/x86_64/linux-initrd rename to config/rootfiles/oldcore/162/filelists/x86_64/linux-initrd diff --git a/config/rootfiles/core/162/filelists/xtables-addons b/config/rootfiles/oldcore/162/filelists/xtables-addons similarity index 100% rename from config/rootfiles/core/162/filelists/xtables-addons rename to config/rootfiles/oldcore/162/filelists/xtables-addons diff --git a/config/rootfiles/core/162/update.sh b/config/rootfiles/oldcore/162/update.sh similarity index 100% rename from config/rootfiles/core/162/update.sh rename to config/rootfiles/oldcore/162/update.sh diff --git a/make.sh b/make.sh index e6f948ba07..ee8c08f961 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.27" # Version number -CORE="162" # Core Level (Filename) +CORE="163" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop