From 16450169d9f8c6cdf6e377ffd4fcc4f72a44f28b Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 22 Sep 2023 01:48:58 -0700 Subject: [PATCH] Fix the subarch used in the hook to identify images for sifive unmatched. LP: #2037060. --- debian/changelog | 7 +++++++ .../hooks.d/base/disk-image-uefi-non-cloud.binary | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3c5f7a4e..d2b4f76b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (23.10.44) UNRELEASED; urgency=medium + + * Fix the subarch used in the hook to identify images for sifive + unmatched. LP: #2037060. + + -- Steve Langasek Fri, 22 Sep 2023 01:48:25 -0700 + livecd-rootfs (23.10.43) mantic; urgency=medium * The unminimize script should install the lxd snap from the per-release diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary index 2235f65f..962f096a 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary @@ -355,7 +355,7 @@ EOF # This explains why we install flash-kernel here. chroot mountpoint bash -c "echo 'StarFive VisionFive 2 v1.3B' > /etc/flash-kernel/machine" ;; - "sifive_unmatched") + unmatched) cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/ chroot mountpoint bash -c "echo 'SiFive HiFive Unmatched A00' > /etc/flash-kernel/machine" chroot mountpoint apt-get install -qqy u-boot-sifive