From 5c43befc3e09d5e52678314d7d43d3769afa2b59 Mon Sep 17 00:00:00 2001
From: j1nx
Date: Thu, 14 Sep 2023 06:29:39 +0000
Subject: [PATCH] [ALL] Small fixes to the update mechnism
---
buildroot-external/board/ovos/ova/grub-efi.cfg | 4 ++++
buildroot-external/board/ovos/raspberrypi/grub-efi.cfg | 4 ++++
buildroot-external/rootfs-overlay/usr/libexec/ovos-update | 7 +------
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/buildroot-external/board/ovos/ova/grub-efi.cfg b/buildroot-external/board/ovos/ova/grub-efi.cfg
index cc9b0f38..5f021f1f 100644
--- a/buildroot-external/board/ovos/ova/grub-efi.cfg
+++ b/buildroot-external/board/ovos/ova/grub-efi.cfg
@@ -18,10 +18,14 @@ file_env -f ($root)/cmdline.txt cmdline
regexp --set 1:boothd (.+),.+ ${root}
menuentry "OpenVoiceOS - Slot A" {
+ set default="0"
+ set fallback="1"
linux (${boothd},gpt2)/boot/kernel root=PARTUUID=c0932a41-44cf-463b-8152-d43188553ed4 ro $default_cmdline $cmdline
}
menuentry "OpenVoiceOS - Slot B" {
+ set default="1"
+ set fallback="0"
linux (${boothd},gpt3)/boot/kernel root=PARTUUID=3adea996-45ad-4928-920e-ffb5aedd00cb ro $default_cmdline $cmdline
}
diff --git a/buildroot-external/board/ovos/raspberrypi/grub-efi.cfg b/buildroot-external/board/ovos/raspberrypi/grub-efi.cfg
index cc9b0f38..5f021f1f 100644
--- a/buildroot-external/board/ovos/raspberrypi/grub-efi.cfg
+++ b/buildroot-external/board/ovos/raspberrypi/grub-efi.cfg
@@ -18,10 +18,14 @@ file_env -f ($root)/cmdline.txt cmdline
regexp --set 1:boothd (.+),.+ ${root}
menuentry "OpenVoiceOS - Slot A" {
+ set default="0"
+ set fallback="1"
linux (${boothd},gpt2)/boot/kernel root=PARTUUID=c0932a41-44cf-463b-8152-d43188553ed4 ro $default_cmdline $cmdline
}
menuentry "OpenVoiceOS - Slot B" {
+ set default="1"
+ set fallback="0"
linux (${boothd},gpt3)/boot/kernel root=PARTUUID=3adea996-45ad-4928-920e-ffb5aedd00cb ro $default_cmdline $cmdline
}
diff --git a/buildroot-external/rootfs-overlay/usr/libexec/ovos-update b/buildroot-external/rootfs-overlay/usr/libexec/ovos-update
index 9805e919..5ea28460 100755
--- a/buildroot-external/rootfs-overlay/usr/libexec/ovos-update
+++ b/buildroot-external/rootfs-overlay/usr/libexec/ovos-update
@@ -6,8 +6,7 @@ fi
function get_current_root_device
{
- PARTUUID=$(swupdate -g | sed 's/PARTUUID=\([^ ]*\).*/\1/');
- CURRENT_ROOT=$(readlink -f /dev/disk/by-partuuid/$PARTUUID);
+ CURRENT_ROOT=$(swupdate -g);
}
function get_update_part
@@ -39,11 +38,7 @@ if [ $1 == "preinst" ]; then
# create a symlink for the update process
ln -sf $UPDATE_ROOT /dev/update
-fi
-if [ $1 == "postinst" ]; then
- get_current_root_device
- get_update_part
sync; /usr/bin/grub-editenv /boot/efi/EFI/BOOT/grubenv set default=$GRUB_DEFAULT; sync;
sync; /usr/bin/grub-editenv /boot/efi/EFI/BOOT/grubenv set fallback=$GRUB_FALLBACK; sync;
fi