From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 5 Dec 2023 18:20:12 +0000 (+0000)
Subject: core183: Re-add commands needed for the kernel update
X-Git-Tag: v2.29-core183~124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43d72238cb760e409d9912a35eb28406eee539de;p=ipfire-2.x.git

core183: Re-add commands needed for the kernel update

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/183/update.sh b/config/rootfiles/core/183/update.sh
index 7dbc3387dc..842e6f6382 100644
--- a/config/rootfiles/core/183/update.sh
+++ b/config/rootfiles/core/183/update.sh
@@ -26,6 +26,18 @@
 
 core=183
 
+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
@@ -40,6 +52,37 @@ if [ -e /boot/uEnv.txt ]; then
     cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
 fi
 
+# 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=$( 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 -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
 
@@ -69,6 +112,11 @@ case "$(uname -m)" in
 		;;
 esac
 
+# Upadate Kernel version in 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}
@@ -81,9 +129,9 @@ touch /var/run/need_reboot
 /etc/init.d/fireinfo start
 sendprofile
 
-# 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
 
 sync