aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.rst1
-rwxr-xr-xscripts/run_archiso.sh12
2 files changed, 7 insertions, 6 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8bb001f..f3a2d54 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -13,6 +13,7 @@ Changed
- Moved the ``pkglist.x86_64.txt`` file outside the bootstrap tarball's ``root.x86_64`` directly to avoid polluting the
root file system.
+- Use 4 MiB OVMF files in ``run_archiso`` instead of the old 2 MiB ones.
Deprecated
----------
diff --git a/scripts/run_archiso.sh b/scripts/run_archiso.sh
index 87e5e25..24df28c 100755
--- a/scripts/run_archiso.sh
+++ b/scripts/run_archiso.sh
@@ -44,11 +44,11 @@ cleanup_working_dir() {
}
copy_ovmf_vars() {
- if [[ ! -f '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' ]]; then
- printf 'ERROR: %s\n' "OVMF_VARS.fd not found. Install edk2-ovmf."
+ if [[ ! -f '/usr/share/edk2/x64/OVMF_VARS.4m.fd' ]]; then
+ printf 'ERROR: %s\n' "OVMF_VARS.4m.fd not found. Install edk2-ovmf."
exit 1
fi
- cp -av -- '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' "${working_dir}/"
+ cp -av -- '/usr/share/edk2/x64/OVMF_VARS.4m.fd' "${working_dir}/"
}
check_image() {
@@ -67,13 +67,13 @@ run_image() {
copy_ovmf_vars
if [[ "${secure_boot}" == 'on' ]]; then
printf '%s\n' 'Using Secure Boot'
- local ovmf_code='/usr/share/edk2-ovmf/x64/OVMF_CODE.secboot.fd'
+ local ovmf_code='/usr/share/edk2/x64/OVMF_CODE.secboot.4m.fd'
else
- local ovmf_code='/usr/share/edk2-ovmf/x64/OVMF_CODE.fd'
+ local ovmf_code='/usr/share/edk2/x64/OVMF_CODE.4m.fd'
fi
qemu_options+=(
'-drive' "if=pflash,format=raw,unit=0,file=${ovmf_code},read-only=on"
- '-drive' "if=pflash,format=raw,unit=1,file=${working_dir}/OVMF_VARS.fd"
+ '-drive' "if=pflash,format=raw,unit=1,file=${working_dir}/OVMF_VARS.4m.fd"
'-global' "driver=cfi.pflash01,property=secure,value=${secure_boot}"
)
fi