core144: start update
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 12 Apr 2020 06:14:26 +0000 (08:14 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 12 Apr 2020 06:14:26 +0000 (08:14 +0200)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
37 files changed:
config/rootfiles/core/144/exclude [moved from config/rootfiles/core/143/exclude with 100% similarity]
config/rootfiles/core/144/filelists/files [new file with mode: 0644]
config/rootfiles/core/144/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/143/exclude [new file with mode: 0644]
config/rootfiles/oldcore/143/filelists/aarch64/binutils [moved from config/rootfiles/core/143/filelists/aarch64/binutils with 100% similarity]
config/rootfiles/oldcore/143/filelists/aarch64/gcc [moved from config/rootfiles/core/143/filelists/aarch64/gcc with 100% similarity]
config/rootfiles/oldcore/143/filelists/aarch64/glibc [moved from config/rootfiles/core/143/filelists/aarch64/glibc with 100% similarity]
config/rootfiles/oldcore/143/filelists/apr [moved from config/rootfiles/core/143/filelists/apr with 100% similarity]
config/rootfiles/oldcore/143/filelists/armv5tel/binutils [moved from config/rootfiles/core/143/filelists/armv5tel/binutils with 100% similarity]
config/rootfiles/oldcore/143/filelists/armv5tel/gcc [moved from config/rootfiles/core/143/filelists/armv5tel/gcc with 100% similarity]
config/rootfiles/oldcore/143/filelists/armv5tel/glibc [moved from config/rootfiles/core/143/filelists/armv5tel/glibc with 100% similarity]
config/rootfiles/oldcore/143/filelists/cairo [moved from config/rootfiles/core/143/filelists/cairo with 100% similarity]
config/rootfiles/oldcore/143/filelists/coreutils [moved from config/rootfiles/core/143/filelists/coreutils with 100% similarity]
config/rootfiles/oldcore/143/filelists/dma [moved from config/rootfiles/core/143/filelists/dma with 100% similarity]
config/rootfiles/oldcore/143/filelists/files [moved from config/rootfiles/core/143/filelists/files with 100% similarity]
config/rootfiles/oldcore/143/filelists/hwdata [moved from config/rootfiles/core/143/filelists/hwdata with 100% similarity]
config/rootfiles/oldcore/143/filelists/i586/binutils [moved from config/rootfiles/core/143/filelists/i586/binutils with 100% similarity]
config/rootfiles/oldcore/143/filelists/i586/gcc [moved from config/rootfiles/core/143/filelists/i586/gcc with 100% similarity]
config/rootfiles/oldcore/143/filelists/i586/glibc [moved from config/rootfiles/core/143/filelists/i586/glibc with 100% similarity]
config/rootfiles/oldcore/143/filelists/i586/openssl-sse2 [moved from config/rootfiles/core/143/filelists/i586/openssl-sse2 with 100% similarity]
config/rootfiles/oldcore/143/filelists/libssh [moved from config/rootfiles/core/143/filelists/libssh with 100% similarity]
config/rootfiles/oldcore/143/filelists/libtool [moved from config/rootfiles/core/143/filelists/libtool with 100% similarity]
config/rootfiles/oldcore/143/filelists/logwatch [moved from config/rootfiles/core/143/filelists/logwatch with 100% similarity]
config/rootfiles/oldcore/143/filelists/ntp [moved from config/rootfiles/core/143/filelists/ntp with 100% similarity]
config/rootfiles/oldcore/143/filelists/openssh [moved from config/rootfiles/core/143/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/143/filelists/openssl [moved from config/rootfiles/core/143/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/143/filelists/pcre [moved from config/rootfiles/core/143/filelists/pcre with 100% similarity]
config/rootfiles/oldcore/143/filelists/smartmontools [moved from config/rootfiles/core/143/filelists/smartmontools with 100% similarity]
config/rootfiles/oldcore/143/filelists/strongswan [moved from config/rootfiles/core/143/filelists/strongswan with 100% similarity]
config/rootfiles/oldcore/143/filelists/unbound [moved from config/rootfiles/core/143/filelists/unbound with 100% similarity]
config/rootfiles/oldcore/143/filelists/x86_64/binutils [moved from config/rootfiles/core/143/filelists/x86_64/binutils with 100% similarity]
config/rootfiles/oldcore/143/filelists/x86_64/gcc [moved from config/rootfiles/core/143/filelists/x86_64/gcc with 100% similarity]
config/rootfiles/oldcore/143/filelists/x86_64/glibc [moved from config/rootfiles/core/143/filelists/x86_64/glibc with 100% similarity]
config/rootfiles/oldcore/143/filelists/xz [moved from config/rootfiles/core/143/filelists/xz with 100% similarity]
config/rootfiles/oldcore/143/update.sh [moved from config/rootfiles/core/143/update.sh with 100% similarity]
html/cgi-bin/credits.cgi
make.sh

diff --git a/config/rootfiles/core/144/filelists/files b/config/rootfiles/core/144/filelists/files
new file mode 100644 (file)
index 0000000..ce4e517
--- /dev/null
@@ -0,0 +1,4 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
diff --git a/config/rootfiles/core/144/update.sh b/config/rootfiles/core/144/update.sh
new file mode 100644 (file)
index 0000000..6a9c519
--- /dev/null
@@ -0,0 +1,80 @@
+#!/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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=144
+
+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/143/exclude b/config/rootfiles/oldcore/143/exclude
new file mode 100644 (file)
index 0000000..b221598
--- /dev/null
@@ -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
index f4f22e1..cecc1c1 100644 (file)
@@ -63,8 +63,8 @@ print <<END
 Michael Tremer,
 Arne Fitzenreiter,
 Christian Schmidt,
-Alexander Marx,
 Stefan Schantl,
+Alexander Marx,
 Matthias Fischer,
 Peter Müller,
 Jan Paul Tücking,
@@ -128,6 +128,7 @@ Julian McConnell,
 Kay-Michael Köhler,
 Kim Wölfel,
 Logan Schmidt,
+Markus Untersee,
 Nico Prenzel,
 Oliver Fuhrer,
 Osmar Gonzalez,
diff --git a/make.sh b/make.sh
index c250d56..03eba4a 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.25"                                                 # Version number
-CORE="143"                                                     # Core Level (Filename)
+CORE="144"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 NICE=10                                                                # Nice level