Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the initrd option in the QEMU launcher script #2239

Merged
merged 1 commit into from
Aug 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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))
Loading