Merge pull request #3956 from zhijianli88/fix-image-scripts

Fix image scripts
This commit is contained in:
James Le Cuirot 2026-04-22 11:21:23 +01:00 committed by GitHub
commit c8915792a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions

View File

@ -806,12 +806,12 @@ _write_qemu_common() {
cat >"${VM_README}" <<EOF
If you have qemu installed (or in the SDK), you can start the image with:
cd path/to/image
./$(basename "${script}") -curses
./$(basename "${script}") -display curses
If you need to use a different ssh key or different ssh port:
./$(basename "${script}") -a ~/.ssh/authorized_keys -p 2223 -- -curses
./$(basename "${script}") -a ~/.ssh/authorized_keys -p 2223 -- -display curses
If you rather you can use the -nographic option instad of -curses. In this
If you rather you can use the -nographic option instad of '-display curses'. In this
mode you can switch from the vm to the qemu monitor console with: Ctrl-a c
See the qemu man page for more details on the monitor console.
@ -917,7 +917,7 @@ _write_pxe_conf() {
cat >>"${VM_README}" <<EOF
You can pass extra kernel parameters with -append, for example:
./$(basename "${script}") -curses -append 'sshkey="PUT AN SSH KEY HERE"'
./$(basename "${script}") -display curses -append 'sshkey="PUT AN SSH KEY HERE"'
When using -nographic or -serial you must also enable the serial console:
./$(basename "${script}") -nographic -append 'console=ttyS0,115200n8'

View File

@ -48,6 +48,10 @@ DEFINE_string getbinpkgver "" \
# include upload options
. "${BUILD_LIBRARY_DIR}/release_util.sh" || exit 1
# Override the default value to false so that
# ./flatcar_production_qemu_uefi.sh can launch the qemu VM later.
FLAGS_only_store_compressed=${FLAGS_FALSE}
# Parse command line
FLAGS "$@" || exit 1
eval set -- "${FLAGS_ARGV}"