Skip to content

Commit

Permalink
Merge pull request #2239 from flatcar/chewi/qemu-initrd-opt
Browse files Browse the repository at this point in the history
Fix the initrd option in the QEMU launcher script
  • Loading branch information
chewi committed Aug 16, 2024
2 parents 860464a + 16563bb commit a212694
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions build_library/qemu_template.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ Options:
(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).
-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).
-R FILE Set initrd for direct boot used to simulate a PXE boot (with -K).
-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).
-s Safe settings: single simple cpu and no KVM.
-h this ;-)
Expand Down Expand Up @@ -105,7 +105,7 @@ while [ $# -ge 1 ]; do
-K|-kernel-file)
VM_KERNEL="$2"
shift 2 ;;
-R|-initrd-file)
-r|-initrd-file)
VM_INITRD="$2"
shift 2 ;;
-v|-verbose)
Expand Down
Original file line number Diff line number Diff line change
@@ -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))

0 comments on commit a212694

Please sign in to comment.