davidlt/fedora-kiwi-descriptions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix aarch64 uki build

Browse Source 
There is no biosboot partition on aarch64, so the root filesystem
on aarch64 is partition 2.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2024-03-26 10:24:12 +01:00
parent 64e5cf610e
commit 436e9d6e48
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
uki-editbootconfig.sh
View File

@ -3,8 +3,8 @@ echo "###" "$0" "$@"
# set arch-specific variables # set arch-specific variables
case "$(uname -m)" in case "$(uname -m)" in
aarch64) arch="aa64"; ARCH="AA64"; uuid="b921b045-1df0-41c3-af44-4c6f280d3fae";; aarch64) arch="aa64"; ARCH="AA64"; uuid="b921b045-1df0-41c3-af44-4c6f280d3fae"; rootfs="2";;
x86_64) arch="x64"; ARCH="X64"; uuid="4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709";; x86_64) arch="x64"; ARCH="X64"; uuid="4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709"; rootfs="3";;
esac esac
# figure where shim.efi and BOOT.CSV are located # figure where shim.efi and BOOT.CSV are located
@ -27,12 +27,12 @@ done
# kiwi doesn't setup discoverable partitions, so fixup after the fact # kiwi doesn't setup discoverable partitions, so fixup after the fact
# here. The UKI depends on that to find the root filesystem. # here. The UKI depends on that to find the root filesystem.
# * The image is loop-mounted. # * The image is loop-mounted, partitions:
# - partition #1 is biosboot (can this be disabled?). # - biosboot (on x86 only, can this be disabled?).
# - partition #2 is the EFI ESP. # - EFI ESP.
# - partition #3 is the root filesystem (this needs fixup). # - root filesystem (this needs fixup).
echo "# hack: rootfs: $uuid" echo "# hack: rootfs: $uuid"
sfdisk --part-type /dev/loop0 3 "$uuid" sfdisk --part-type /dev/loop0 "$rootfs" "$uuid"
# bz2240989: shim has a hard dependency on grub. grub has a hard # bz2240989: shim has a hard dependency on grub. grub has a hard
# dependency on dracut. Ideally we would simply not install # dependency on dracut. Ideally we would simply not install