jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-24 13:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix path to cmdline after successful RPi 5 tryboot (#3085)

Browse Source 
Path to cmdline is set in tryboot.txt to cmdline-tryboot.txt before
attempting A/B boot. After successful boot, tryboot.txt is relocated
to config.txt, yet the config path of cmdline is not changed and remains
set to cmdline-tryboot.txt which doesn't exist anymore at that point,
causing following reboots to fail.

Fixes #3065
This commit is contained in:
Jan Čermák 2024-01-17 17:56:29 +01:00 committed by GitHub
parent e7c15f9aa6
commit bde080336e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildroot-external/board/raspberrypi/rpi5-64/rootfs-overlay/usr/lib/rauc/rpi-tryboot.sh
View File

@ -67,7 +67,7 @@ case "$1" in
else
rm -f "${boot_dir}/slot-${slot_bootname}/.good"
exit 0
fi
fi
# It seems we call set-state in any case. Use this to "commit" tryboot
# state...
@ -76,13 +76,15 @@ case "$1" in
if ! cmp -s -n 4 /proc/device-tree/chosen/bootloader/tryboot /dev/zero; then
cmdline_tryboot=$(head -n1 "${boot_dir}/cmdline-tryboot.txt")
tryboot_slot=$(get_value rauc.slot "${cmdline_tryboot}")
if [ "${tryboot_slot}" != "${slot_bootname}" ]; then
if [ "${tryboot_slot}" != "${slot_bootname}" ]; then
echo "tryboot doesn't reflect the expected boot slot, not committing." >&2
exit 1
fi
echo "Committing tryboot state to primary boot" >&2
mv "${boot_dir}/tryboot.txt" "${boot_dir}/config.txt"
sed -e "s/^\(cmdline=\).*$/\1\/cmdline.txt/" \
"${boot_dir}/tryboot.txt" > "${boot_dir}/config.txt"
mv "${boot_dir}/cmdline-tryboot.txt" "${boot_dir}/cmdline.txt"
rm "${boot_dir}/tryboot.txt"
fi
;;