From 767424794729edf75c5aab5d2138c461ad124946 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 4 Jun 2020 08:49:28 +0200 Subject: [PATCH] start core146 and add the kernel Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/{145 => 146}/exclude | 0 .../core/146/filelists/aarch64/linux | 1 + .../core/146/filelists/aarch64/linux-initrd | 1 + .../146/filelists/armv5tel/linux-initrd-multi | 1 + .../core/146/filelists/armv5tel/linux-multi | 1 + config/rootfiles/core/146/filelists/files | 4 + .../rootfiles/core/146/filelists/i586/linux | 1 + .../core/146/filelists/i586/linux-initrd | 1 + .../rootfiles/core/146/filelists/x86_64/linux | 1 + .../core/146/filelists/x86_64/linux-initrd | 1 + config/rootfiles/core/146/update.sh | 149 ++++++++++++++++++ config/rootfiles/oldcore/145/exclude | 28 ++++ .../145/filelists/BerkeleyDB | 0 .../{core => oldcore}/145/filelists/berkeley | 0 .../145/filelists/berkeley-compat | 0 .../{core => oldcore}/145/filelists/bind | 0 .../{core => oldcore}/145/filelists/coreutils | 0 .../{core => oldcore}/145/filelists/files | 0 .../{core => oldcore}/145/filelists/gnupg | 0 .../{core => oldcore}/145/filelists/gzip | 0 .../145/filelists/i586/hyperscan | 0 .../{core => oldcore}/145/filelists/iproute2 | 0 .../{core => oldcore}/145/filelists/ipset | 0 .../{core => oldcore}/145/filelists/knot | 0 .../145/filelists/libenvent2 | 0 .../{core => oldcore}/145/filelists/libhtp | 0 .../{core => oldcore}/145/filelists/libjpeg | 0 .../{core => oldcore}/145/filelists/libpng | 0 .../{core => oldcore}/145/filelists/libusb | 0 .../145/filelists/libwww-perl | 0 .../{core => oldcore}/145/filelists/openldap | 0 .../145/filelists/perl-DBD-SQLite | 0 .../{core => oldcore}/145/filelists/perl-DBI | 0 .../{core => oldcore}/145/filelists/squid | 0 .../{core => oldcore}/145/filelists/suricata | 0 .../{core => oldcore}/145/filelists/unbound | 0 .../{core => oldcore}/145/filelists/vnstat | 0 .../145/filelists/x86_64/hyperscan | 0 .../rootfiles/{core => oldcore}/145/update.sh | 0 make.sh | 2 +- 40 files changed, 190 insertions(+), 1 deletion(-) rename config/rootfiles/core/{145 => 146}/exclude (100%) create mode 120000 config/rootfiles/core/146/filelists/aarch64/linux create mode 120000 config/rootfiles/core/146/filelists/aarch64/linux-initrd create mode 120000 config/rootfiles/core/146/filelists/armv5tel/linux-initrd-multi create mode 120000 config/rootfiles/core/146/filelists/armv5tel/linux-multi create mode 100644 config/rootfiles/core/146/filelists/files create mode 120000 config/rootfiles/core/146/filelists/i586/linux create mode 120000 config/rootfiles/core/146/filelists/i586/linux-initrd create mode 120000 config/rootfiles/core/146/filelists/x86_64/linux create mode 120000 config/rootfiles/core/146/filelists/x86_64/linux-initrd create mode 100644 config/rootfiles/core/146/update.sh create mode 100644 config/rootfiles/oldcore/145/exclude rename config/rootfiles/{core => oldcore}/145/filelists/BerkeleyDB (100%) rename config/rootfiles/{core => oldcore}/145/filelists/berkeley (100%) rename config/rootfiles/{core => oldcore}/145/filelists/berkeley-compat (100%) rename config/rootfiles/{core => oldcore}/145/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/145/filelists/coreutils (100%) rename config/rootfiles/{core => oldcore}/145/filelists/files (100%) rename config/rootfiles/{core => oldcore}/145/filelists/gnupg (100%) rename config/rootfiles/{core => oldcore}/145/filelists/gzip (100%) rename config/rootfiles/{core => oldcore}/145/filelists/i586/hyperscan (100%) rename config/rootfiles/{core => oldcore}/145/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/145/filelists/ipset (100%) rename config/rootfiles/{core => oldcore}/145/filelists/knot (100%) rename config/rootfiles/{core => oldcore}/145/filelists/libenvent2 (100%) rename config/rootfiles/{core => oldcore}/145/filelists/libhtp (100%) rename config/rootfiles/{core => oldcore}/145/filelists/libjpeg (100%) rename config/rootfiles/{core => oldcore}/145/filelists/libpng (100%) rename config/rootfiles/{core => oldcore}/145/filelists/libusb (100%) rename config/rootfiles/{core => oldcore}/145/filelists/libwww-perl (100%) rename config/rootfiles/{core => oldcore}/145/filelists/openldap (100%) rename config/rootfiles/{core => oldcore}/145/filelists/perl-DBD-SQLite (100%) rename config/rootfiles/{core => oldcore}/145/filelists/perl-DBI (100%) rename config/rootfiles/{core => oldcore}/145/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/145/filelists/suricata (100%) rename config/rootfiles/{core => oldcore}/145/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/145/filelists/vnstat (100%) rename config/rootfiles/{core => oldcore}/145/filelists/x86_64/hyperscan (100%) rename config/rootfiles/{core => oldcore}/145/update.sh (100%) diff --git a/config/rootfiles/core/145/exclude b/config/rootfiles/core/146/exclude similarity index 100% rename from config/rootfiles/core/145/exclude rename to config/rootfiles/core/146/exclude diff --git a/config/rootfiles/core/146/filelists/aarch64/linux b/config/rootfiles/core/146/filelists/aarch64/linux new file mode 120000 index 0000000000..3a2532bc7d --- /dev/null +++ b/config/rootfiles/core/146/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/146/filelists/aarch64/linux-initrd b/config/rootfiles/core/146/filelists/aarch64/linux-initrd new file mode 120000 index 0000000000..8acdb0f318 --- /dev/null +++ b/config/rootfiles/core/146/filelists/aarch64/linux-initrd @@ -0,0 +1 @@ +../../../../common/aarch64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/146/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/146/filelists/armv5tel/linux-initrd-multi new file mode 120000 index 0000000000..0b1b4530a8 --- /dev/null +++ b/config/rootfiles/core/146/filelists/armv5tel/linux-initrd-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-initrd-multi \ No newline at end of file diff --git a/config/rootfiles/core/146/filelists/armv5tel/linux-multi b/config/rootfiles/core/146/filelists/armv5tel/linux-multi new file mode 120000 index 0000000000..204eb4c437 --- /dev/null +++ b/config/rootfiles/core/146/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/146/filelists/files b/config/rootfiles/core/146/filelists/files new file mode 100644 index 0000000000..ce4e517681 --- /dev/null +++ b/config/rootfiles/core/146/filelists/files @@ -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/146/filelists/i586/linux b/config/rootfiles/core/146/filelists/i586/linux new file mode 120000 index 0000000000..693ec4bbf9 --- /dev/null +++ b/config/rootfiles/core/146/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/146/filelists/i586/linux-initrd b/config/rootfiles/core/146/filelists/i586/linux-initrd new file mode 120000 index 0000000000..32a03e6a90 --- /dev/null +++ b/config/rootfiles/core/146/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/146/filelists/x86_64/linux b/config/rootfiles/core/146/filelists/x86_64/linux new file mode 120000 index 0000000000..0615b5b9ad --- /dev/null +++ b/config/rootfiles/core/146/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/146/filelists/x86_64/linux-initrd b/config/rootfiles/core/146/filelists/x86_64/linux-initrd new file mode 120000 index 0000000000..1b9fff70ff --- /dev/null +++ b/config/rootfiles/core/146/filelists/x86_64/linux-initrd @@ -0,0 +1 @@ +../../../../common/x86_64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/146/update.sh b/config/rootfiles/core/146/update.sh new file mode 100644 index 0000000000..da00a387ae --- /dev/null +++ b/config/rootfiles/core/146/update.sh @@ -0,0 +1,149 @@ +#!/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=146 + +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 + +KVER="xxxKVERxxx" + +# Backup uEnv.txt if exist +if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org +fi + +# Do some sanity checks. +case $(uname -r) in + *-ipfire-kirkwood) + exit_with_error "ERROR cannot update. kirkwood kernel was not supported." 1 + ;; + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac +if [ -e /boot/grub/grub.conf ]; then + exit_with_error "ERROR unsupported GRUB1/pygrub found!" 1 +fi + +# 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 the old kernel +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-*-ipfire-* +rm -rf /boot/zImage-*-ipfire-* +rm -rf /boot/uInit-*-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +# Remove files + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# remove dropped packages +for package in linux-pae; do + if [ -e /opt/pakfire/db/installed/meta-$package ]; then + stop_service $package + for i in $(cat /opt/pakfire/db/rootfiles/$package); do + rm -rfv /${i} + done + fi + rm -f /opt/pakfire/db/installed/meta-$package + rm -f /opt/pakfire/db/meta/meta-$package + rm -f /opt/pakfire/db/rootfiles/$package +done + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Start services + +# remove lm_sensor config after collectd was started +# to reserch sensors at next boot with updated kernel +rm -f /etc/sysconfig/lm_sensors + +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# 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 + +# 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/145/exclude b/config/rootfiles/oldcore/145/exclude new file mode 100644 index 0000000000..b221598781 --- /dev/null +++ b/config/rootfiles/oldcore/145/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/145/filelists/BerkeleyDB b/config/rootfiles/oldcore/145/filelists/BerkeleyDB similarity index 100% rename from config/rootfiles/core/145/filelists/BerkeleyDB rename to config/rootfiles/oldcore/145/filelists/BerkeleyDB diff --git a/config/rootfiles/core/145/filelists/berkeley b/config/rootfiles/oldcore/145/filelists/berkeley similarity index 100% rename from config/rootfiles/core/145/filelists/berkeley rename to config/rootfiles/oldcore/145/filelists/berkeley diff --git a/config/rootfiles/core/145/filelists/berkeley-compat b/config/rootfiles/oldcore/145/filelists/berkeley-compat similarity index 100% rename from config/rootfiles/core/145/filelists/berkeley-compat rename to config/rootfiles/oldcore/145/filelists/berkeley-compat diff --git a/config/rootfiles/core/145/filelists/bind b/config/rootfiles/oldcore/145/filelists/bind similarity index 100% rename from config/rootfiles/core/145/filelists/bind rename to config/rootfiles/oldcore/145/filelists/bind diff --git a/config/rootfiles/core/145/filelists/coreutils b/config/rootfiles/oldcore/145/filelists/coreutils similarity index 100% rename from config/rootfiles/core/145/filelists/coreutils rename to config/rootfiles/oldcore/145/filelists/coreutils diff --git a/config/rootfiles/core/145/filelists/files b/config/rootfiles/oldcore/145/filelists/files similarity index 100% rename from config/rootfiles/core/145/filelists/files rename to config/rootfiles/oldcore/145/filelists/files diff --git a/config/rootfiles/core/145/filelists/gnupg b/config/rootfiles/oldcore/145/filelists/gnupg similarity index 100% rename from config/rootfiles/core/145/filelists/gnupg rename to config/rootfiles/oldcore/145/filelists/gnupg diff --git a/config/rootfiles/core/145/filelists/gzip b/config/rootfiles/oldcore/145/filelists/gzip similarity index 100% rename from config/rootfiles/core/145/filelists/gzip rename to config/rootfiles/oldcore/145/filelists/gzip diff --git a/config/rootfiles/core/145/filelists/i586/hyperscan b/config/rootfiles/oldcore/145/filelists/i586/hyperscan similarity index 100% rename from config/rootfiles/core/145/filelists/i586/hyperscan rename to config/rootfiles/oldcore/145/filelists/i586/hyperscan diff --git a/config/rootfiles/core/145/filelists/iproute2 b/config/rootfiles/oldcore/145/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/145/filelists/iproute2 rename to config/rootfiles/oldcore/145/filelists/iproute2 diff --git a/config/rootfiles/core/145/filelists/ipset b/config/rootfiles/oldcore/145/filelists/ipset similarity index 100% rename from config/rootfiles/core/145/filelists/ipset rename to config/rootfiles/oldcore/145/filelists/ipset diff --git a/config/rootfiles/core/145/filelists/knot b/config/rootfiles/oldcore/145/filelists/knot similarity index 100% rename from config/rootfiles/core/145/filelists/knot rename to config/rootfiles/oldcore/145/filelists/knot diff --git a/config/rootfiles/core/145/filelists/libenvent2 b/config/rootfiles/oldcore/145/filelists/libenvent2 similarity index 100% rename from config/rootfiles/core/145/filelists/libenvent2 rename to config/rootfiles/oldcore/145/filelists/libenvent2 diff --git a/config/rootfiles/core/145/filelists/libhtp b/config/rootfiles/oldcore/145/filelists/libhtp similarity index 100% rename from config/rootfiles/core/145/filelists/libhtp rename to config/rootfiles/oldcore/145/filelists/libhtp diff --git a/config/rootfiles/core/145/filelists/libjpeg b/config/rootfiles/oldcore/145/filelists/libjpeg similarity index 100% rename from config/rootfiles/core/145/filelists/libjpeg rename to config/rootfiles/oldcore/145/filelists/libjpeg diff --git a/config/rootfiles/core/145/filelists/libpng b/config/rootfiles/oldcore/145/filelists/libpng similarity index 100% rename from config/rootfiles/core/145/filelists/libpng rename to config/rootfiles/oldcore/145/filelists/libpng diff --git a/config/rootfiles/core/145/filelists/libusb b/config/rootfiles/oldcore/145/filelists/libusb similarity index 100% rename from config/rootfiles/core/145/filelists/libusb rename to config/rootfiles/oldcore/145/filelists/libusb diff --git a/config/rootfiles/core/145/filelists/libwww-perl b/config/rootfiles/oldcore/145/filelists/libwww-perl similarity index 100% rename from config/rootfiles/core/145/filelists/libwww-perl rename to config/rootfiles/oldcore/145/filelists/libwww-perl diff --git a/config/rootfiles/core/145/filelists/openldap b/config/rootfiles/oldcore/145/filelists/openldap similarity index 100% rename from config/rootfiles/core/145/filelists/openldap rename to config/rootfiles/oldcore/145/filelists/openldap diff --git a/config/rootfiles/core/145/filelists/perl-DBD-SQLite b/config/rootfiles/oldcore/145/filelists/perl-DBD-SQLite similarity index 100% rename from config/rootfiles/core/145/filelists/perl-DBD-SQLite rename to config/rootfiles/oldcore/145/filelists/perl-DBD-SQLite diff --git a/config/rootfiles/core/145/filelists/perl-DBI b/config/rootfiles/oldcore/145/filelists/perl-DBI similarity index 100% rename from config/rootfiles/core/145/filelists/perl-DBI rename to config/rootfiles/oldcore/145/filelists/perl-DBI diff --git a/config/rootfiles/core/145/filelists/squid b/config/rootfiles/oldcore/145/filelists/squid similarity index 100% rename from config/rootfiles/core/145/filelists/squid rename to config/rootfiles/oldcore/145/filelists/squid diff --git a/config/rootfiles/core/145/filelists/suricata b/config/rootfiles/oldcore/145/filelists/suricata similarity index 100% rename from config/rootfiles/core/145/filelists/suricata rename to config/rootfiles/oldcore/145/filelists/suricata diff --git a/config/rootfiles/core/145/filelists/unbound b/config/rootfiles/oldcore/145/filelists/unbound similarity index 100% rename from config/rootfiles/core/145/filelists/unbound rename to config/rootfiles/oldcore/145/filelists/unbound diff --git a/config/rootfiles/core/145/filelists/vnstat b/config/rootfiles/oldcore/145/filelists/vnstat similarity index 100% rename from config/rootfiles/core/145/filelists/vnstat rename to config/rootfiles/oldcore/145/filelists/vnstat diff --git a/config/rootfiles/core/145/filelists/x86_64/hyperscan b/config/rootfiles/oldcore/145/filelists/x86_64/hyperscan similarity index 100% rename from config/rootfiles/core/145/filelists/x86_64/hyperscan rename to config/rootfiles/oldcore/145/filelists/x86_64/hyperscan diff --git a/config/rootfiles/core/145/update.sh b/config/rootfiles/oldcore/145/update.sh similarity index 100% rename from config/rootfiles/core/145/update.sh rename to config/rootfiles/oldcore/145/update.sh diff --git a/make.sh b/make.sh index b949058806..5ed15a0f5a 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="145" # Core Level (Filename) +CORE="146" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level -- 2.39.5