From: Arne Fitzenreiter Date: Mon, 20 Sep 2021 13:57:26 +0000 (+0000) Subject: core161: start updater X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f06578af15465ab9eedca2e4840d070b8497a81c;p=people%2Fms%2Fipfire-2.x.git core161: start updater Signed-off-by: Arne Fitzenreiter --- diff --git a/config/rootfiles/core/161/exclude b/config/rootfiles/core/161/exclude new file mode 100644 index 0000000000..b41e1070db --- /dev/null +++ b/config/rootfiles/core/161/exclude @@ -0,0 +1,35 @@ +boot/grub/grub.cfg +boot/grub/grubenv +boot/uEnv.txt +boot/uboot.env +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/161/filelists/aarch64/linux b/config/rootfiles/core/161/filelists/aarch64/linux new file mode 120000 index 0000000000..3a2532bc7d --- /dev/null +++ b/config/rootfiles/core/161/filelists/aarch64/linux @@ -0,0 +1 @@ +../../../../common/aarch64/linux \ No newline at end of file diff --git a/config/rootfiles/core/161/filelists/aarch64/linux-initrd b/config/rootfiles/core/161/filelists/aarch64/linux-initrd new file mode 120000 index 0000000000..8acdb0f318 --- /dev/null +++ b/config/rootfiles/core/161/filelists/aarch64/linux-initrd @@ -0,0 +1 @@ +../../../../common/aarch64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/161/filelists/armv6l/linux b/config/rootfiles/core/161/filelists/armv6l/linux new file mode 120000 index 0000000000..aee1f4d734 --- /dev/null +++ b/config/rootfiles/core/161/filelists/armv6l/linux @@ -0,0 +1 @@ +../../../../common/armv6l/linux \ No newline at end of file diff --git a/config/rootfiles/core/161/filelists/armv6l/linux-initrd b/config/rootfiles/core/161/filelists/armv6l/linux-initrd new file mode 120000 index 0000000000..4af11bfa1e --- /dev/null +++ b/config/rootfiles/core/161/filelists/armv6l/linux-initrd @@ -0,0 +1 @@ +../../../../common/armv6l/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/161/filelists/core-files b/config/rootfiles/core/161/filelists/core-files new file mode 100644 index 0000000000..f196f54d8a --- /dev/null +++ b/config/rootfiles/core/161/filelists/core-files @@ -0,0 +1,5 @@ +etc/issue +etc/os-release +etc/system-release +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/161/filelists/files b/config/rootfiles/core/161/filelists/files new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/config/rootfiles/core/161/filelists/files @@ -0,0 +1 @@ + diff --git a/config/rootfiles/core/161/filelists/i586/linux b/config/rootfiles/core/161/filelists/i586/linux new file mode 120000 index 0000000000..693ec4bbf9 --- /dev/null +++ b/config/rootfiles/core/161/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/161/filelists/i586/linux-initrd b/config/rootfiles/core/161/filelists/i586/linux-initrd new file mode 120000 index 0000000000..32a03e6a90 --- /dev/null +++ b/config/rootfiles/core/161/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/161/filelists/x86_64/linux b/config/rootfiles/core/161/filelists/x86_64/linux new file mode 120000 index 0000000000..0615b5b9ad --- /dev/null +++ b/config/rootfiles/core/161/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/161/filelists/x86_64/linux-initrd b/config/rootfiles/core/161/filelists/x86_64/linux-initrd new file mode 120000 index 0000000000..1b9fff70ff --- /dev/null +++ b/config/rootfiles/core/161/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/161/update.sh b/config/rootfiles/core/161/update.sh new file mode 100644 index 0000000000..d882397f59 --- /dev/null +++ b/config/rootfiles/core/161/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) 2021 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=161 + +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*) + # 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 old/renamed u-boot files +rm -rf /boot/kernel* +rm -rf /usr/share/u-boot/rpi* + +# Remove files + +# Stop services + +# Extract files +extract_files + +# Fix permissions just in case they broke again +chmod -v 755 \ + /usr \ + /usr/bin \ + /usr/lib \ + /usr/sbin \ + /var \ + /var/ipfire + +# update linker config +ldconfig + +# 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 + +# Install updated grub +/usr/bin/install-bootloader + +# 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/core/160/exclude b/config/rootfiles/oldcore/160/exclude similarity index 100% rename from config/rootfiles/core/160/exclude rename to config/rootfiles/oldcore/160/exclude diff --git a/config/rootfiles/core/160/filelists/Text-Tabs+Wrap b/config/rootfiles/oldcore/160/filelists/Text-Tabs+Wrap similarity index 100% rename from config/rootfiles/core/160/filelists/Text-Tabs+Wrap rename to config/rootfiles/oldcore/160/filelists/Text-Tabs+Wrap diff --git a/config/rootfiles/core/160/filelists/aarch64/glibc b/config/rootfiles/oldcore/160/filelists/aarch64/glibc similarity index 100% rename from config/rootfiles/core/160/filelists/aarch64/glibc rename to config/rootfiles/oldcore/160/filelists/aarch64/glibc diff --git a/config/rootfiles/core/160/filelists/armv6l/glibc b/config/rootfiles/oldcore/160/filelists/armv6l/glibc similarity index 100% rename from config/rootfiles/core/160/filelists/armv6l/glibc rename to config/rootfiles/oldcore/160/filelists/armv6l/glibc diff --git a/config/rootfiles/core/160/filelists/curl b/config/rootfiles/oldcore/160/filelists/curl similarity index 100% rename from config/rootfiles/core/160/filelists/curl rename to config/rootfiles/oldcore/160/filelists/curl diff --git a/config/rootfiles/core/160/filelists/ddns b/config/rootfiles/oldcore/160/filelists/ddns similarity index 100% rename from config/rootfiles/core/160/filelists/ddns rename to config/rootfiles/oldcore/160/filelists/ddns diff --git a/config/rootfiles/core/160/filelists/e2fsprogs b/config/rootfiles/oldcore/160/filelists/e2fsprogs similarity index 100% rename from config/rootfiles/core/160/filelists/e2fsprogs rename to config/rootfiles/oldcore/160/filelists/e2fsprogs diff --git a/config/rootfiles/core/160/filelists/ethtool b/config/rootfiles/oldcore/160/filelists/ethtool similarity index 100% rename from config/rootfiles/core/160/filelists/ethtool rename to config/rootfiles/oldcore/160/filelists/ethtool diff --git a/config/rootfiles/core/160/filelists/files b/config/rootfiles/oldcore/160/filelists/files similarity index 100% rename from config/rootfiles/core/160/filelists/files rename to config/rootfiles/oldcore/160/filelists/files diff --git a/config/rootfiles/core/160/filelists/i586/glibc b/config/rootfiles/oldcore/160/filelists/i586/glibc similarity index 100% rename from config/rootfiles/core/160/filelists/i586/glibc rename to config/rootfiles/oldcore/160/filelists/i586/glibc diff --git a/config/rootfiles/core/160/filelists/iproute2 b/config/rootfiles/oldcore/160/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/160/filelists/iproute2 rename to config/rootfiles/oldcore/160/filelists/iproute2 diff --git a/config/rootfiles/core/160/filelists/less b/config/rootfiles/oldcore/160/filelists/less similarity index 100% rename from config/rootfiles/core/160/filelists/less rename to config/rootfiles/oldcore/160/filelists/less diff --git a/config/rootfiles/core/160/filelists/libhtp b/config/rootfiles/oldcore/160/filelists/libhtp similarity index 100% rename from config/rootfiles/core/160/filelists/libhtp rename to config/rootfiles/oldcore/160/filelists/libhtp diff --git a/config/rootfiles/core/160/filelists/libidn b/config/rootfiles/oldcore/160/filelists/libidn similarity index 100% rename from config/rootfiles/core/160/filelists/libidn rename to config/rootfiles/oldcore/160/filelists/libidn diff --git a/config/rootfiles/core/160/filelists/libloc b/config/rootfiles/oldcore/160/filelists/libloc similarity index 100% rename from config/rootfiles/core/160/filelists/libloc rename to config/rootfiles/oldcore/160/filelists/libloc diff --git a/config/rootfiles/core/160/filelists/libssh b/config/rootfiles/oldcore/160/filelists/libssh similarity index 100% rename from config/rootfiles/core/160/filelists/libssh rename to config/rootfiles/oldcore/160/filelists/libssh diff --git a/config/rootfiles/core/160/filelists/libtasn1 b/config/rootfiles/oldcore/160/filelists/libtasn1 similarity index 100% rename from config/rootfiles/core/160/filelists/libtasn1 rename to config/rootfiles/oldcore/160/filelists/libtasn1 diff --git a/config/rootfiles/core/160/filelists/openssh b/config/rootfiles/oldcore/160/filelists/openssh similarity index 100% rename from config/rootfiles/core/160/filelists/openssh rename to config/rootfiles/oldcore/160/filelists/openssh diff --git a/config/rootfiles/core/160/filelists/openssl b/config/rootfiles/oldcore/160/filelists/openssl similarity index 100% rename from config/rootfiles/core/160/filelists/openssl rename to config/rootfiles/oldcore/160/filelists/openssl diff --git a/config/rootfiles/core/160/filelists/p11-kit b/config/rootfiles/oldcore/160/filelists/p11-kit similarity index 100% rename from config/rootfiles/core/160/filelists/p11-kit rename to config/rootfiles/oldcore/160/filelists/p11-kit diff --git a/config/rootfiles/core/160/filelists/pcre b/config/rootfiles/oldcore/160/filelists/pcre similarity index 100% rename from config/rootfiles/core/160/filelists/pcre rename to config/rootfiles/oldcore/160/filelists/pcre diff --git a/config/rootfiles/core/160/filelists/perl-MIME-Lite b/config/rootfiles/oldcore/160/filelists/perl-MIME-Lite similarity index 100% rename from config/rootfiles/core/160/filelists/perl-MIME-Lite rename to config/rootfiles/oldcore/160/filelists/perl-MIME-Lite diff --git a/config/rootfiles/core/160/filelists/poppler b/config/rootfiles/oldcore/160/filelists/poppler similarity index 100% rename from config/rootfiles/core/160/filelists/poppler rename to config/rootfiles/oldcore/160/filelists/poppler diff --git a/config/rootfiles/core/160/filelists/release-files b/config/rootfiles/oldcore/160/filelists/release-files similarity index 100% rename from config/rootfiles/core/160/filelists/release-files rename to config/rootfiles/oldcore/160/filelists/release-files diff --git a/config/rootfiles/core/160/filelists/sqlite b/config/rootfiles/oldcore/160/filelists/sqlite similarity index 100% rename from config/rootfiles/core/160/filelists/sqlite rename to config/rootfiles/oldcore/160/filelists/sqlite diff --git a/config/rootfiles/core/160/filelists/strongswan b/config/rootfiles/oldcore/160/filelists/strongswan similarity index 100% rename from config/rootfiles/core/160/filelists/strongswan rename to config/rootfiles/oldcore/160/filelists/strongswan diff --git a/config/rootfiles/core/160/filelists/sudo b/config/rootfiles/oldcore/160/filelists/sudo similarity index 100% rename from config/rootfiles/core/160/filelists/sudo rename to config/rootfiles/oldcore/160/filelists/sudo diff --git a/config/rootfiles/core/160/filelists/suricata b/config/rootfiles/oldcore/160/filelists/suricata similarity index 100% rename from config/rootfiles/core/160/filelists/suricata rename to config/rootfiles/oldcore/160/filelists/suricata diff --git a/config/rootfiles/core/160/filelists/sysfsutils b/config/rootfiles/oldcore/160/filelists/sysfsutils similarity index 100% rename from config/rootfiles/core/160/filelists/sysfsutils rename to config/rootfiles/oldcore/160/filelists/sysfsutils diff --git a/config/rootfiles/core/160/filelists/sysstat b/config/rootfiles/oldcore/160/filelists/sysstat similarity index 100% rename from config/rootfiles/core/160/filelists/sysstat rename to config/rootfiles/oldcore/160/filelists/sysstat diff --git a/config/rootfiles/core/160/filelists/udev b/config/rootfiles/oldcore/160/filelists/udev similarity index 100% rename from config/rootfiles/core/160/filelists/udev rename to config/rootfiles/oldcore/160/filelists/udev diff --git a/config/rootfiles/core/160/filelists/wireless-regdb b/config/rootfiles/oldcore/160/filelists/wireless-regdb similarity index 100% rename from config/rootfiles/core/160/filelists/wireless-regdb rename to config/rootfiles/oldcore/160/filelists/wireless-regdb diff --git a/config/rootfiles/core/160/filelists/x86_64/glibc b/config/rootfiles/oldcore/160/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/160/filelists/x86_64/glibc rename to config/rootfiles/oldcore/160/filelists/x86_64/glibc diff --git a/config/rootfiles/core/160/update.sh b/config/rootfiles/oldcore/160/update.sh similarity index 100% rename from config/rootfiles/core/160/update.sh rename to config/rootfiles/oldcore/160/update.sh diff --git a/make.sh b/make.sh index 8b97b24df6..5c60f029bf 100755 --- a/make.sh +++ b/make.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007-2020 IPFire Team . # +# Copyright (C) 2007-2021 IPFire Team . # # # ############################################################################ # @@ -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="160" # Core Level (Filename) +CORE="161" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop