faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use QEMU 6.x options

Browse Source 
scripts/run_archiso:
Change parameters to qemu's `-drive` option to make use of the explicit `read-only=on`, as the implicit `read-only` is
now obsolete.

Closes #126
This commit is contained in:
David Runge 2021-05-06 01:40:17 +02:00
parent c58b44f016
commit 4b14350e5f
No known key found for this signature in database
GPG Key ID: 7258734B41C31549
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/run_archiso.sh
View File

@ -73,7 +73,7 @@ run_image() {
local ovmf_code='/usr/share/edk2-ovmf/x64/OVMF_CODE.fd' local ovmf_code='/usr/share/edk2-ovmf/x64/OVMF_CODE.fd'
fi fi
qemu_options+=( qemu_options+=(
'-drive' "if=pflash,format=raw,unit=0,file=${ovmf_code},readonly" '-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.fd"
'-global' "driver=cfi.pflash01,property=secure,value=${secure_boot}" '-global' "driver=cfi.pflash01,property=secure,value=${secure_boot}"
) )
@ -89,7 +89,7 @@ run_image() {
if [[ -n "${oddimage}" ]]; then if [[ -n "${oddimage}" ]]; then
qemu_options+=( qemu_options+=(
'-device' 'scsi-cd,bus=scsi0.0,drive=cdrom1' '-device' 'scsi-cd,bus=scsi0.0,drive=cdrom1'
'-drive' "id=cdrom1,if=none,format=raw,media=cdrom,readonly=on,file=${oddimage}" '-drive' "id=cdrom1,if=none,format=raw,media=cdrom,read-only=on,file=${oddimage}"
) )
fi fi
@ -100,7 +100,7 @@ run_image() {
-name archiso,process=archiso_0 \ -name archiso,process=archiso_0 \
-device virtio-scsi-pci,id=scsi0 \ -device virtio-scsi-pci,id=scsi0 \
-device "scsi-${mediatype%rom},bus=scsi0.0,drive=${mediatype}0" \ -device "scsi-${mediatype%rom},bus=scsi0.0,drive=${mediatype}0" \
-drive "id=${mediatype}0,if=none,format=raw,media=${mediatype/hd/disk},readonly=on,file=${image}" \ -drive "id=${mediatype}0,if=none,format=raw,media=${mediatype/hd/disk},read-only=on,file=${image}" \
-display "${display}" \ -display "${display}" \
-vga virtio \ -vga virtio \
-audiodev pa,id=snd0 \ -audiodev pa,id=snd0 \