]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Start Core Update 163
authorPeter Müller <peter.mueller@ipfire.org>
Fri, 3 Dec 2021 17:15:43 +0000 (18:15 +0100)
committerPeter Müller <peter.mueller@ipfire.org>
Fri, 3 Dec 2021 17:15:43 +0000 (18:15 +0100)
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
40 files changed:
config/rootfiles/core/163/core-files [new file with mode: 0644]
config/rootfiles/core/163/exclude [new file with mode: 0644]
config/rootfiles/core/163/files [new file with mode: 0644]
config/rootfiles/core/163/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/162/exclude [moved from config/rootfiles/core/162/exclude with 100% similarity]
config/rootfiles/oldcore/162/filelists/aarch64/linux [moved from config/rootfiles/core/162/filelists/aarch64/linux with 100% similarity]
config/rootfiles/oldcore/162/filelists/aarch64/linux-initrd [moved from config/rootfiles/core/162/filelists/aarch64/linux-initrd with 100% similarity]
config/rootfiles/oldcore/162/filelists/aarch64/rpi-firmware [moved from config/rootfiles/core/162/filelists/aarch64/rpi-firmware with 100% similarity]
config/rootfiles/oldcore/162/filelists/armv6l/linux [moved from config/rootfiles/core/162/filelists/armv6l/linux with 100% similarity]
config/rootfiles/oldcore/162/filelists/armv6l/linux-initrd [moved from config/rootfiles/core/162/filelists/armv6l/linux-initrd with 100% similarity]
config/rootfiles/oldcore/162/filelists/armv6l/rpi-firmware [moved from config/rootfiles/core/162/filelists/armv6l/rpi-firmware with 100% similarity]
config/rootfiles/oldcore/162/filelists/bind [moved from config/rootfiles/core/162/filelists/bind with 100% similarity]
config/rootfiles/oldcore/162/filelists/core-files [moved from config/rootfiles/core/162/filelists/core-files with 100% similarity]
config/rootfiles/oldcore/162/filelists/coreutils [moved from config/rootfiles/core/162/filelists/coreutils with 100% similarity]
config/rootfiles/oldcore/162/filelists/ddns [moved from config/rootfiles/core/162/filelists/ddns with 100% similarity]
config/rootfiles/oldcore/162/filelists/dhcpcd [moved from config/rootfiles/core/162/filelists/dhcpcd with 100% similarity]
config/rootfiles/oldcore/162/filelists/files [moved from config/rootfiles/core/162/filelists/files with 100% similarity]
config/rootfiles/oldcore/162/filelists/gawk [moved from config/rootfiles/core/162/filelists/gawk with 100% similarity]
config/rootfiles/oldcore/162/filelists/i586/linux [moved from config/rootfiles/core/162/filelists/i586/linux with 100% similarity]
config/rootfiles/oldcore/162/filelists/i586/linux-initrd [moved from config/rootfiles/core/162/filelists/i586/linux-initrd with 100% similarity]
config/rootfiles/oldcore/162/filelists/i586/motd [moved from config/rootfiles/core/162/filelists/i586/motd with 100% similarity]
config/rootfiles/oldcore/162/filelists/jansson [moved from config/rootfiles/core/162/filelists/jansson with 100% similarity]
config/rootfiles/oldcore/162/filelists/knot [moved from config/rootfiles/core/162/filelists/knot with 100% similarity]
config/rootfiles/oldcore/162/filelists/libffi [moved from config/rootfiles/core/162/filelists/libffi with 100% similarity]
config/rootfiles/oldcore/162/filelists/libhtp [moved from config/rootfiles/core/162/filelists/libhtp with 100% similarity]
config/rootfiles/oldcore/162/filelists/libloc [moved from config/rootfiles/core/162/filelists/libloc with 100% similarity]
config/rootfiles/oldcore/162/filelists/libuv [moved from config/rootfiles/core/162/filelists/libuv with 100% similarity]
config/rootfiles/oldcore/162/filelists/libxcrypt [moved from config/rootfiles/core/162/filelists/libxcrypt with 100% similarity]
config/rootfiles/oldcore/162/filelists/openssh [moved from config/rootfiles/core/162/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/162/filelists/openvpn [moved from config/rootfiles/core/162/filelists/openvpn with 100% similarity]
config/rootfiles/oldcore/162/filelists/slang [moved from config/rootfiles/core/162/filelists/slang with 100% similarity]
config/rootfiles/oldcore/162/filelists/sshfs [moved from config/rootfiles/core/162/filelists/sshfs with 100% similarity]
config/rootfiles/oldcore/162/filelists/suricata [moved from config/rootfiles/core/162/filelists/suricata with 100% similarity]
config/rootfiles/oldcore/162/filelists/unbound [moved from config/rootfiles/core/162/filelists/unbound with 100% similarity]
config/rootfiles/oldcore/162/filelists/whois [moved from config/rootfiles/core/162/filelists/whois with 100% similarity]
config/rootfiles/oldcore/162/filelists/x86_64/linux [moved from config/rootfiles/core/162/filelists/x86_64/linux with 100% similarity]
config/rootfiles/oldcore/162/filelists/x86_64/linux-initrd [moved from config/rootfiles/core/162/filelists/x86_64/linux-initrd with 100% similarity]
config/rootfiles/oldcore/162/filelists/xtables-addons [moved from config/rootfiles/core/162/filelists/xtables-addons with 100% similarity]
config/rootfiles/oldcore/162/update.sh [moved from config/rootfiles/core/162/update.sh with 100% similarity]
make.sh

diff --git a/config/rootfiles/core/163/core-files b/config/rootfiles/core/163/core-files
new file mode 100644 (file)
index 0000000..0dec37e
--- /dev/null
@@ -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 (file)
index 0000000..818039f
--- /dev/null
@@ -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 (file)
index 0000000..e69de29
diff --git a/config/rootfiles/core/163/update.sh b/config/rootfiles/core/163/update.sh
new file mode 100644 (file)
index 0000000..e51dbf0
--- /dev/null
@@ -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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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/make.sh b/make.sh
index e6f948ba073c14ca05f3374d620263fcb2990f7d..ee8c08f961adafcb1211cb04be55b19e0977635e 100755 (executable)
--- 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