From: Michael Tremer Date: Tue, 5 Dec 2023 17:13:44 +0000 (+0000) Subject: core183: Start Core Update 183 X-Git-Tag: v2.29-core183~132 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e36e826ad9eadcaac5964bef895cdd41b33d5129;p=ipfire-2.x.git core183: Start Core Update 183 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/182/exclude b/config/rootfiles/core/183/exclude similarity index 100% rename from config/rootfiles/core/182/exclude rename to config/rootfiles/core/183/exclude diff --git a/config/rootfiles/core/182/filelists/core-files b/config/rootfiles/core/183/filelists/core-files similarity index 100% rename from config/rootfiles/core/182/filelists/core-files rename to config/rootfiles/core/183/filelists/core-files diff --git a/config/rootfiles/core/183/filelists/files b/config/rootfiles/core/183/filelists/files new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/183/update.sh b/config/rootfiles/core/183/update.sh new file mode 100644 index 0000000000..7dbc3387dc --- /dev/null +++ b/config/rootfiles/core/183/update.sh @@ -0,0 +1,92 @@ +#!/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) 2023 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=183 + +# 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 + +KVER="xxxKVERxxx" + +# Backup uEnv.txt if exist +if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org +fi + +# Extract files +extract_files + +# Remove files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Apply local configuration to sshd_config +/usr/local/bin/sshctrl + +# Start services + +# Rebuild initial ramdisks +dracut --regenerate-all --force +KVER="xxxKVERxxx" +case "$(uname -m)" in + aarch64) + mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire + # dont remove initramfs because grub need this to boot. + ;; +esac + +# Call user update script (needed for some ARM boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +# This update needs a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Grub version was updated, reinstall it +if [ -e /boot/grub/grub.cfg ]; then + /usr/bin/install-bootloader +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/182/exclude b/config/rootfiles/oldcore/182/exclude new file mode 100644 index 0000000000..8ee1c3c2f5 --- /dev/null +++ b/config/rootfiles/oldcore/182/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 +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/lib/location/ipset +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/182/filelists/aarch64/grub b/config/rootfiles/oldcore/182/filelists/aarch64/grub similarity index 100% rename from config/rootfiles/core/182/filelists/aarch64/grub rename to config/rootfiles/oldcore/182/filelists/aarch64/grub diff --git a/config/rootfiles/core/182/filelists/aarch64/u-boot b/config/rootfiles/oldcore/182/filelists/aarch64/u-boot similarity index 100% rename from config/rootfiles/core/182/filelists/aarch64/u-boot rename to config/rootfiles/oldcore/182/filelists/aarch64/u-boot diff --git a/config/rootfiles/core/182/filelists/ca-certificates b/config/rootfiles/oldcore/182/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/182/filelists/ca-certificates rename to config/rootfiles/oldcore/182/filelists/ca-certificates diff --git a/config/rootfiles/oldcore/182/filelists/core-files b/config/rootfiles/oldcore/182/filelists/core-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/oldcore/182/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/182/filelists/dhcpcd b/config/rootfiles/oldcore/182/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/182/filelists/dhcpcd rename to config/rootfiles/oldcore/182/filelists/dhcpcd diff --git a/config/rootfiles/core/182/filelists/files b/config/rootfiles/oldcore/182/filelists/files similarity index 100% rename from config/rootfiles/core/182/filelists/files rename to config/rootfiles/oldcore/182/filelists/files diff --git a/config/rootfiles/core/182/filelists/gawk b/config/rootfiles/oldcore/182/filelists/gawk similarity index 100% rename from config/rootfiles/core/182/filelists/gawk rename to config/rootfiles/oldcore/182/filelists/gawk diff --git a/config/rootfiles/core/182/filelists/harfbuzz b/config/rootfiles/oldcore/182/filelists/harfbuzz similarity index 100% rename from config/rootfiles/core/182/filelists/harfbuzz rename to config/rootfiles/oldcore/182/filelists/harfbuzz diff --git a/config/rootfiles/core/182/filelists/hwdata b/config/rootfiles/oldcore/182/filelists/hwdata similarity index 100% rename from config/rootfiles/core/182/filelists/hwdata rename to config/rootfiles/oldcore/182/filelists/hwdata diff --git a/config/rootfiles/core/182/filelists/iana-etc b/config/rootfiles/oldcore/182/filelists/iana-etc similarity index 100% rename from config/rootfiles/core/182/filelists/iana-etc rename to config/rootfiles/oldcore/182/filelists/iana-etc diff --git a/config/rootfiles/core/182/filelists/iproute2 b/config/rootfiles/oldcore/182/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/182/filelists/iproute2 rename to config/rootfiles/oldcore/182/filelists/iproute2 diff --git a/config/rootfiles/core/182/filelists/jq b/config/rootfiles/oldcore/182/filelists/jq similarity index 100% rename from config/rootfiles/core/182/filelists/jq rename to config/rootfiles/oldcore/182/filelists/jq diff --git a/config/rootfiles/core/182/filelists/libsodium b/config/rootfiles/oldcore/182/filelists/libsodium similarity index 100% rename from config/rootfiles/core/182/filelists/libsodium rename to config/rootfiles/oldcore/182/filelists/libsodium diff --git a/config/rootfiles/core/182/filelists/lua b/config/rootfiles/oldcore/182/filelists/lua similarity index 100% rename from config/rootfiles/core/182/filelists/lua rename to config/rootfiles/oldcore/182/filelists/lua diff --git a/config/rootfiles/core/182/filelists/openssh b/config/rootfiles/oldcore/182/filelists/openssh similarity index 100% rename from config/rootfiles/core/182/filelists/openssh rename to config/rootfiles/oldcore/182/filelists/openssh diff --git a/config/rootfiles/core/182/filelists/p11-kit b/config/rootfiles/oldcore/182/filelists/p11-kit similarity index 100% rename from config/rootfiles/core/182/filelists/p11-kit rename to config/rootfiles/oldcore/182/filelists/p11-kit diff --git a/config/rootfiles/core/182/filelists/qpdf b/config/rootfiles/oldcore/182/filelists/qpdf similarity index 100% rename from config/rootfiles/core/182/filelists/qpdf rename to config/rootfiles/oldcore/182/filelists/qpdf diff --git a/config/rootfiles/core/182/filelists/riscv64/grub b/config/rootfiles/oldcore/182/filelists/riscv64/grub similarity index 100% rename from config/rootfiles/core/182/filelists/riscv64/grub rename to config/rootfiles/oldcore/182/filelists/riscv64/grub diff --git a/config/rootfiles/core/182/filelists/shadow b/config/rootfiles/oldcore/182/filelists/shadow similarity index 100% rename from config/rootfiles/core/182/filelists/shadow rename to config/rootfiles/oldcore/182/filelists/shadow diff --git a/config/rootfiles/core/182/filelists/sqlite b/config/rootfiles/oldcore/182/filelists/sqlite similarity index 100% rename from config/rootfiles/core/182/filelists/sqlite rename to config/rootfiles/oldcore/182/filelists/sqlite diff --git a/config/rootfiles/core/182/filelists/squid b/config/rootfiles/oldcore/182/filelists/squid similarity index 100% rename from config/rootfiles/core/182/filelists/squid rename to config/rootfiles/oldcore/182/filelists/squid diff --git a/config/rootfiles/core/182/filelists/strongswan b/config/rootfiles/oldcore/182/filelists/strongswan similarity index 100% rename from config/rootfiles/core/182/filelists/strongswan rename to config/rootfiles/oldcore/182/filelists/strongswan diff --git a/config/rootfiles/core/182/filelists/sudo b/config/rootfiles/oldcore/182/filelists/sudo similarity index 100% rename from config/rootfiles/core/182/filelists/sudo rename to config/rootfiles/oldcore/182/filelists/sudo diff --git a/config/rootfiles/core/182/filelists/unbound b/config/rootfiles/oldcore/182/filelists/unbound similarity index 100% rename from config/rootfiles/core/182/filelists/unbound rename to config/rootfiles/oldcore/182/filelists/unbound diff --git a/config/rootfiles/core/182/filelists/usbutils b/config/rootfiles/oldcore/182/filelists/usbutils similarity index 100% rename from config/rootfiles/core/182/filelists/usbutils rename to config/rootfiles/oldcore/182/filelists/usbutils diff --git a/config/rootfiles/core/182/filelists/x86_64/grub b/config/rootfiles/oldcore/182/filelists/x86_64/grub similarity index 100% rename from config/rootfiles/core/182/filelists/x86_64/grub rename to config/rootfiles/oldcore/182/filelists/x86_64/grub diff --git a/config/rootfiles/core/182/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/182/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/182/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/182/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/182/filelists/xfsprogs b/config/rootfiles/oldcore/182/filelists/xfsprogs similarity index 100% rename from config/rootfiles/core/182/filelists/xfsprogs rename to config/rootfiles/oldcore/182/filelists/xfsprogs diff --git a/config/rootfiles/core/182/filelists/xz b/config/rootfiles/oldcore/182/filelists/xz similarity index 100% rename from config/rootfiles/core/182/filelists/xz rename to config/rootfiles/oldcore/182/filelists/xz diff --git a/config/rootfiles/core/182/update.sh b/config/rootfiles/oldcore/182/update.sh similarity index 100% rename from config/rootfiles/core/182/update.sh rename to config/rootfiles/oldcore/182/update.sh diff --git a/make.sh b/make.sh index a5390b788a..51c29e2a48 100755 --- a/make.sh +++ b/make.sh @@ -22,8 +22,8 @@ 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="182" # Core Level (Filename) +VERSION="2.29" # Version number +CORE="183" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop