From mboxrd@z Thu Jan 1 00:00:00 1970
From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
43d72238cb760e409d9912a35eb28406eee539de
Date: Tue, 05 Dec 2023 18:20:28 +0000
Message-ID: <4Sl83J6fsXz2xjP@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9146559060973341869=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============9146559060973341869==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 43d72238cb760e409d9912a35eb28406eee539de (commit)
from a7c9eca495950ebff2ace51676c04523aced082f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 43d72238cb760e409d9912a35eb28406eee539de
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 5 18:20:12 2023 +0000
core183: Re-add commands needed for the kernel update
=20
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/183/update.sh | 52 +++++++++++++++++++++++++++++++++++=
--
1 file changed, 50 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/183/update.sh b/config/rootfiles/core/183/=
update.sh
index 7dbc3387d..842e6f638 100644
--- a/config/rootfiles/core/183/update.sh
+++ b/config/rootfiles/core/183/update.sh
@@ -26,6 +26,18 @@
=20
core=3D183
=20
+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=3D1; i<=3D$core; i++ )); do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
@@ -40,6 +52,37 @@ if [ -e /boot/uEnv.txt ]; then
cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
fi
=20
+# Do some sanity checks prior to the kernel update
+case $(uname -r) in
+ *-ipfire*)
+ # Ok.
+ ;;
+ *)
+ exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+ ;;
+esac
+
+# Check diskspace on root
+ROOTSPACE=3D$( 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 ro=
ot." 2
+ exit 2
+fi
+
+# Remove the old kernel
+rm -rvf \
+ /boot/System.map-* \
+ /boot/config-* \
+ /boot/ipfirerd-* \
+ /boot/initramfs-* \
+ /boot/vmlinuz-* \
+ /boot/uImage-* \
+ /boot/zImage-* \
+ /boot/uInit-* \
+ /boot/dtb-* \
+ /lib/modules
+
# Extract files
extract_files
=20
@@ -69,6 +112,11 @@ case "$(uname -m)" in
;;
esac
=20
+# Upadate Kernel version in uEnv.txt
+if [ -e /boot/uEnv.txt ]; then
+ sed -i -e "s/KVER=3D.*/KVER=3D${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}
@@ -81,9 +129,9 @@ touch /var/run/need_reboot
/etc/init.d/fireinfo start
sendprofile
=20
-# Grub version was updated, reinstall it
+# Update grub config to display new core version
if [ -e /boot/grub/grub.cfg ]; then
- /usr/bin/install-bootloader
+ grub-mkconfig -o /boot/grub/grub.cfg
fi
=20
sync
hooks/post-receive
--
IPFire 2.x development tree
--===============9146559060973341869==--