Start Core Update 154

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2020-12-10 12:28:12 +00:00
parent eaa9032166
commit 86a7c165a1
36 changed files with 105 additions and 1 deletions

View File

@@ -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

View File

@@ -0,0 +1 @@
../../../../common/aarch64/linux

View File

@@ -0,0 +1 @@
../../../../common/aarch64/linux-initrd

View File

@@ -0,0 +1 @@
../../../../common/armv5tel/linux-initrd-multi

View File

@@ -0,0 +1 @@
../../../../common/armv5tel/linux-multi

View File

@@ -0,0 +1 @@
../../../common/bash

View File

@@ -0,0 +1 @@
../../../common/curl

View File

@@ -0,0 +1 @@
../../../common/ddns

View File

@@ -0,0 +1 @@
../../../common/file

View File

@@ -0,0 +1,28 @@
etc/issue
etc/ntp.conf
etc/os-release
etc/rc.d/init.d/network
etc/rc.d/init.d/unbound
etc/system-release
etc/sysctl.conf
lib/udev/network-hotplug-bridges
srv/web/ipfire/cgi-bin/connections.cgi
srv/web/ipfire/cgi-bin/country.cgi
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/dns.cgi
srv/web/ipfire/cgi-bin/ddns.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ipinfo.cgi
srv/web/ipfire/cgi-bin/location-block.cgi
srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/remote.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/cgi-bin/zoneconf.cgi
srv/web/ipfire/html/include/zoneconf.js
usr/lib/firewall/rules.pl
var/ipfire/location-functions.pl
var/ipfire/langs

View File

@@ -0,0 +1 @@
../../../common/hwdata

View File

@@ -0,0 +1 @@
../../../../common/i586/intel-microcode

View File

@@ -0,0 +1 @@
../../../../common/i586/linux

View File

@@ -0,0 +1 @@
../../../../common/i586/linux-initrd

View File

@@ -0,0 +1 @@
../../../../common/i586/openssl-sse2

View File

@@ -0,0 +1 @@
../../../common/ids-ruleset-sources

View File

@@ -0,0 +1 @@
../../../common/knot

View File

@@ -0,0 +1 @@
../../../common/libarchive

View File

@@ -0,0 +1 @@
../../../common/libhtp

View File

@@ -0,0 +1 @@
../../../common/libloc

View File

@@ -0,0 +1 @@
../../../common/logwatch

View File

@@ -0,0 +1 @@
../../../common/openssl

View File

@@ -0,0 +1 @@
../../../common/openvpn

View File

@@ -0,0 +1 @@
../../../common/strongswan

View File

@@ -0,0 +1 @@
../../../common/suricata

View File

@@ -0,0 +1 @@
../../../common/tzdata

View File

@@ -0,0 +1 @@
../../../common/usb_modeswitch

View File

@@ -0,0 +1 @@
../../../common/usb_modeswitch_data

View File

@@ -0,0 +1 @@
../../../../common/x86_64/intel-microcode

View File

@@ -0,0 +1 @@
../../../../common/x86_64/linux

View File

@@ -0,0 +1 @@
../../../../common/x86_64/linux-initrd

View File

@@ -0,0 +1,159 @@
#!/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=153
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
/etc/init.d/ipsec stop
/usr/local/bin/openvpnctrl -k
/usr/local/bin/openvpnctrl -kn2n
# Extract files
extract_files
# update linker config
ldconfig
# Update permissions
chown -vR root:root /etc/ntp
# Update owernship of "/var/ipfire/red"
chown nobody:nobody /var/ipfire/red
# Update Language cache
/usr/local/bin/update-lang-cache
# Filesytem cleanup
/usr/local/bin/filesystem-cleanup
# Fix invalid cronjob syntax
sed -e "s/^%hourly,random \* \* \*/%hourly,random */g" \
-i /var/spool/cron/root.orig
fcrontab -z
# Start services
if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
/etc/init.d/ipsec start
fi
/etc/init.d/suricata restart
/usr/local/bin/openvpnctrl -s
/usr/local/bin/openvpnctrl -sn2n
# Reload sysctl.conf
sysctl -p
# 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