From 656abbc6d4e3391898cfe275576c75b28032aec9 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 25 Apr 2020 08:55:14 +0000 Subject: [PATCH] start core145 Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/{144 => 145}/exclude | 0 config/rootfiles/core/145/filelists/files | 5 ++ config/rootfiles/core/145/update.sh | 79 +++++++++++++++++++ config/rootfiles/oldcore/144/exclude | 28 +++++++ .../{core => oldcore}/144/filelists/apache2 | 0 .../{core => oldcore}/144/filelists/bind | 0 .../{core => oldcore}/144/filelists/calamaris | 0 .../{core => oldcore}/144/filelists/dhcpcd | 0 .../{core => oldcore}/144/filelists/files | 0 .../144/filelists/i586/openssl-sse2 | 0 .../{core => oldcore}/144/filelists/openssl | 0 .../{core => oldcore}/144/filelists/squid | 0 .../rootfiles/{core => oldcore}/144/update.sh | 0 make.sh | 2 +- 14 files changed, 113 insertions(+), 1 deletion(-) rename config/rootfiles/core/{144 => 145}/exclude (100%) create mode 100644 config/rootfiles/core/145/filelists/files create mode 100644 config/rootfiles/core/145/update.sh create mode 100644 config/rootfiles/oldcore/144/exclude rename config/rootfiles/{core => oldcore}/144/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/144/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/144/filelists/calamaris (100%) rename config/rootfiles/{core => oldcore}/144/filelists/dhcpcd (100%) rename config/rootfiles/{core => oldcore}/144/filelists/files (100%) rename config/rootfiles/{core => oldcore}/144/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/144/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/144/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/144/update.sh (100%) diff --git a/config/rootfiles/core/144/exclude b/config/rootfiles/core/145/exclude similarity index 100% rename from config/rootfiles/core/144/exclude rename to config/rootfiles/core/145/exclude diff --git a/config/rootfiles/core/145/filelists/files b/config/rootfiles/core/145/filelists/files new file mode 100644 index 0000000000..6ab4faa47e --- /dev/null +++ b/config/rootfiles/core/145/filelists/files @@ -0,0 +1,5 @@ +etc/os-release +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/145/update.sh b/config/rootfiles/core/145/update.sh new file mode 100644 index 0000000000..3d3305e678 --- /dev/null +++ b/config/rootfiles/core/145/update.sh @@ -0,0 +1,79 @@ +#!/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) 2020 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=145 + +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 + +# Remove files + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Start services + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# 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/144/exclude b/config/rootfiles/oldcore/144/exclude new file mode 100644 index 0000000000..b221598781 --- /dev/null +++ b/config/rootfiles/oldcore/144/exclude @@ -0,0 +1,28 @@ +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 +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/144/filelists/apache2 b/config/rootfiles/oldcore/144/filelists/apache2 similarity index 100% rename from config/rootfiles/core/144/filelists/apache2 rename to config/rootfiles/oldcore/144/filelists/apache2 diff --git a/config/rootfiles/core/144/filelists/bind b/config/rootfiles/oldcore/144/filelists/bind similarity index 100% rename from config/rootfiles/core/144/filelists/bind rename to config/rootfiles/oldcore/144/filelists/bind diff --git a/config/rootfiles/core/144/filelists/calamaris b/config/rootfiles/oldcore/144/filelists/calamaris similarity index 100% rename from config/rootfiles/core/144/filelists/calamaris rename to config/rootfiles/oldcore/144/filelists/calamaris diff --git a/config/rootfiles/core/144/filelists/dhcpcd b/config/rootfiles/oldcore/144/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/144/filelists/dhcpcd rename to config/rootfiles/oldcore/144/filelists/dhcpcd diff --git a/config/rootfiles/core/144/filelists/files b/config/rootfiles/oldcore/144/filelists/files similarity index 100% rename from config/rootfiles/core/144/filelists/files rename to config/rootfiles/oldcore/144/filelists/files diff --git a/config/rootfiles/core/144/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/144/filelists/i586/openssl-sse2 similarity index 100% rename from config/rootfiles/core/144/filelists/i586/openssl-sse2 rename to config/rootfiles/oldcore/144/filelists/i586/openssl-sse2 diff --git a/config/rootfiles/core/144/filelists/openssl b/config/rootfiles/oldcore/144/filelists/openssl similarity index 100% rename from config/rootfiles/core/144/filelists/openssl rename to config/rootfiles/oldcore/144/filelists/openssl diff --git a/config/rootfiles/core/144/filelists/squid b/config/rootfiles/oldcore/144/filelists/squid similarity index 100% rename from config/rootfiles/core/144/filelists/squid rename to config/rootfiles/oldcore/144/filelists/squid diff --git a/config/rootfiles/core/144/update.sh b/config/rootfiles/oldcore/144/update.sh similarity index 100% rename from config/rootfiles/core/144/update.sh rename to config/rootfiles/oldcore/144/update.sh diff --git a/make.sh b/make.sh index 636289cd46..5dffad2e6d 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.25" # Version number -CORE="144" # Core Level (Filename) +CORE="145" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level -- 2.39.5