From 231d10a83ce97eb3df450c253b90e81e84ffad29 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 26 Aug 2022 11:30:14 -0600 Subject: [PATCH] Always use live disk for aarch64 --- mk/disk.mk | 2 +- mk/qemu.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mk/disk.mk b/mk/disk.mk index 417980d..30e8752 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -59,7 +59,7 @@ build/livedisk-efi.bin: build/bootloader-live.efi build/filesystem.bin mkfs.vfat $@.esp && \ mmd -i $@.esp efi && \ mmd -i $@.esp efi/boot && \ - mcopy -i $@.esp $< ::efi/boot/bootx64.efi && \ + mcopy -i $@.esp $< ::$(BOOTLOADER_EFI_PATH) && \ # Create the disk \ dd if=/dev/zero of=$@ bs=1048576 count=$$(expr $$(du -m $< | cut -f1) + 2 + $$(du -m build/filesystem.bin | cut -f1)) && \ # Create partition table \ diff --git a/mk/qemu.mk b/mk/qemu.mk index f8f9959..a6eb7fb 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -13,6 +13,7 @@ else ifeq ($(ARCH),x86_64) else ifeq ($(ARCH),aarch64) efi=yes kvm=no + live=yes #TODO: support vga vga=no QEMU_ARCH=aarch64