mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-14 08:26:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2239 from flatcar/chewi/qemu-initrd-opt

Browse Source 
Fix the initrd option in the QEMU launcher script
This commit is contained in:
James Le Cuirot 2024-08-16 17:23:12 +01:00 committed by GitHub
commit a212694bde
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_library/qemu_template.sh
View File

@ -35,8 +35,8 @@ Options:
(see https://github.com/stefanberger/swtpm/wiki/Certificates-created-by-swtpm_setup). (see https://github.com/stefanberger/swtpm/wiki/Certificates-created-by-swtpm_setup).
-R FILE Set up pflash ro content, e.g., for UEFI (with -W). -R FILE Set up pflash ro content, e.g., for UEFI (with -W).
-W FILE Set up pflash rw content, e.g., for UEFI (with -R). -W FILE Set up pflash rw content, e.g., for UEFI (with -R).
-K FILE Set kernel for direct boot used to simulate a PXE boot (with -R). -K FILE Set kernel for direct boot used to simulate a PXE boot (with -r).
-R FILE Set initrd for direct boot used to simulate a PXE boot (with -K). -r FILE Set initrd for direct boot used to simulate a PXE boot (with -K).
-s Safe settings: single simple cpu and no KVM. -s Safe settings: single simple cpu and no KVM.
-h this ;-) -h this ;-)
@ -105,7 +105,7 @@ while [ $# -ge 1 ]; do
-K|-kernel-file) -K|-kernel-file)
VM_KERNEL="$2" VM_KERNEL="$2"
shift 2 ;; shift 2 ;;
-R|-initrd-file) -r|-initrd-file)
VM_INITRD="$2" VM_INITRD="$2"
shift 2 ;; shift 2 ;;
-v|-verbose) -v|-verbose)

1
changelog/bugfixes/2024-08-16-qemu-launcher-initrd-option.md Normal file
View File

@ -0,0 +1 @@
- Fixed the initrd option in the QEMU launcher script. It was -R, but this was already taken by the read-only pflash option, so use -r instead. ([scripts#2239](https://github.com/flatcar/scripts/pull/2239))