jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-16 17:46:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove old migrations from RAUC hook (#4083)

Browse Source 
As we're moving to another major release and 15.2 will be mandated update
before 16.0, we can (or even must) remove some old migrations.
This commit is contained in:
Jan Čermák 2025-05-28 17:06:52 +02:00 committed by GitHub
parent cf970a5b63
commit 3e3372b7dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
buildroot-external/ota/rauc-hook
View File

@ -42,42 +42,6 @@ install_boot() {
cp -f "${BOOT_TMP}"/*.txt "${BOOT_MNT}/" || true cp -f "${BOOT_TMP}"/*.txt "${BOOT_MNT}/" || true
cp -f "${BOOT_TMP}"/grubenv "${BOOT_MNT}"/EFI/BOOT/ || true cp -f "${BOOT_TMP}"/grubenv "${BOOT_MNT}"/EFI/BOOT/ || true
fi fi
# Add CM5 support for Yellow. Can be removed in HAOS 15.
if [ "$RAUC_SYSTEM_COMPATIBLE" = "haos-yellow" ]; then
if ! grep -q "\[cm5\]" "${BOOT_MNT}/config.txt"; then
echo "Adding CM5 config to config.txt"
# Remove old single device_tree config and add CM-specific ones
sed -i '/device_tree=bcm2711-rpi-cm4-ha-yellow.dtb/d; s/\[all\]/\[cm4\]\ndevice_tree=bcm2711-rpi-cm4-ha-yellow.dtb\n\n\[cm5\]\ndevice_tree=bcm2712-rpi-cm5-ha-yellow.dtb\n\n\[all\]/' "${BOOT_MNT}/config.txt"
fi
fi
# Fix for Pi3 not booting from some SD cards with now default initial_turbo=60
# see: https://github.com/home-assistant/operating-system/issues/3965
if [ "$RAUC_SYSTEM_COMPATIBLE" = "haos-rpi3" ] || [ "$RAUC_SYSTEM_COMPATIBLE" = "haos-rpi3-64" ]; then
# Don't change anything if initial_turbo is already set anywhere
if ! grep -q "^initial_turbo=" "${BOOT_MNT}/config.txt"; then
if grep -q '^\[pi3\]' "${BOOT_MNT}/config.txt"; then
echo "Adding initial_turbo=0 to [pi3] section of config.txt"
sed -i '/^\[pi3\]/a # Added to fix #3965\ninitial_turbo=0' "${BOOT_MNT}/config.txt"
else
echo "Adding [pi3] section with initial_turbo=0 to config.txt"
sed -i 's/^\[all\]/\[pi3\]\n# Added to fix #3965\ninitial_turbo=0\n\n\[all\]/' "${BOOT_MNT}/config.txt"
fi
fi
fi
# Prepare rauc.db for migration, should be removed in HAOS 16
# (along with raucdb-migrate.service and related raucdb-update changes)
if [ -f /mnt/data/rauc.db ]; then
# shellcheck disable=SC1091
. /etc/os-release
# Do not migrate if already running on OS 15.
if [ "${VERSION_ID%%.*}" != "15" ]; then
touch /mnt/boot/migrate-raucdb
fi
fi
} }
install_spl() { install_spl() {

13
buildroot-external/rootfs-overlay/usr/lib/systemd/system/raucdb-migrate.service
View File

@ -1,13 +0,0 @@
[Unit]
Description=Migrate rauc.db to boot partition
Before=rauc.service
RequiresMountsFor=/mnt/boot /mnt/data
ConditionPathExists=/mnt/boot/migrate-raucdb
[Service]
Type=oneshot
ExecStart=/bin/cp /mnt/data/rauc.db /mnt/boot/
ExecStartPost=/bin/rm /mnt/boot/migrate-raucdb
[Install]
WantedBy=multi-user.target

5
buildroot-external/rootfs-overlay/usr/libexec/raucdb-update
View File

@ -3,11 +3,6 @@
set -e set -e
# Remove rauc.db from old location before migration in HAOS 15.
if [ -f /mnt/data/rauc.db ]; then
rm -f /mnt/data/rauc.db
fi
if grep -q 'slot\.boot\.0' /mnt/boot/rauc.db; then if grep -q 'slot\.boot\.0' /mnt/boot/rauc.db; then
echo "[INFO] rauc.db already contains slot information" echo "[INFO] rauc.db already contains slot information"
exit 0 exit 0