From: Peter Müller <peter.mueller@ipfire.org>
Date: Wed, 22 Nov 2023 21:50:15 +0000 (+0000)
Subject: Core Update 172: Ship u-boot and regenerate all initrds
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62f2f2ab9da638756d0a13ffe1605d6ef414c438;p=people%2Fms%2Fipfire-2.x.git

Core Update 172: Ship u-boot and regenerate all initrds

This ensures the newly compiled mkimage is executed on the system.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---

diff --git a/config/rootfiles/core/182/filelists/aarch64/u-boot b/config/rootfiles/core/182/filelists/aarch64/u-boot
new file mode 120000
index 0000000000..2a16bdbfe2
--- /dev/null
+++ b/config/rootfiles/core/182/filelists/aarch64/u-boot
@@ -0,0 +1 @@
+../../../../common/aarch64/u-boot
\ No newline at end of file
diff --git a/config/rootfiles/core/182/update.sh b/config/rootfiles/core/182/update.sh
index b03183e9cb..db70446c35 100644
--- a/config/rootfiles/core/182/update.sh
+++ b/config/rootfiles/core/182/update.sh
@@ -37,6 +37,13 @@ done
 /etc/rc.d/init.d/unbound stop
 /etc/rc.d/init.d/sshd stop
 
+KVER="xxxKVERxxx"
+
+# Backup uEnv.txt if exist
+if [ -e /boot/uEnv.txt ]; then
+    cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+fi
+
 # Extract files
 extract_files
 
@@ -83,6 +90,21 @@ if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
 	/etc/rc.d/init.d/ipsec start
 fi
 
+# Rebuild initial ramdisks
+dracut --regenerate-all --force
+KVER="xxxKVERxxx"
+case "$(uname -m)" in
+	aarch64)
+		mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire
+		# dont remove initramfs because grub need this to boot.
+		;;
+esac
+
+# 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