Skip to content

qemu_template: fix -S flag when '-- -snapshot' was provided #4311

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.

Sign up for GitHub

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

Merged
t-lo merged 1 commit into from
Oct 8, 2026
Merged

qemu_template: fix -S flag when '-- -snapshot' was provided #4311

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions build_library/qemu_template.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SAFE_ARGS=0
FORWARDED_PORTS=""
PRIMARY_DISK_OPTS=""
DISKS=()
SNAPSHOT="off"
SNAPSHOT=""
USAGE="Usage: $0 [-a authorized_keys] [--] [qemu options...]
Options:
-i FILE File containing an Ignition config
Expand Down Expand Up @@ -133,7 +133,7 @@ while [ $# -ge 1 ]; do
VM_INITRD="$2"
shift 2 ;;
-S|-snapshot)
SNAPSHOT="on"
SNAPSHOT=",snapshot=on"
shift ;;
-v|-verbose)
set -x
Expand Down Expand Up @@ -276,14 +276,14 @@ if [ -n "${CONFIG_DRIVE}" ]; then
fi

if [ -n "${CONFIG_IMAGE}" ]; then
set -- -drive if=virtio,file="${CONFIG_IMAGE}",snapshot="${SNAPSHOT}" "$@"
set -- -drive if=virtio,file="${CONFIG_IMAGE}${SNAPSHOT}" "$@"
fi

if [ -n "${VM_IMAGE}" ]; then
if [[ ,${PRIMARY_DISK_OPTS}, = *,drive=* || ,${PRIMARY_DISK_OPTS}, = *,bootindex=* ]]; then
die "Can't override drive or bootindex options for primary disk"
fi
set -- -drive if=none,id=blk,file="${VM_IMAGE}",snapshot="${SNAPSHOT}" \
set -- -drive if=none,id=blk,file="${VM_IMAGE}${SNAPSHOT}" \
-device virtio-blk-pci,drive=blk,bootindex=1${PRIMARY_DISK_OPTS:+,}${PRIMARY_DISK_OPTS:-} "$@"
fi

Expand All @@ -299,7 +299,7 @@ for disk in "${DISKS[@]}"; do
disk_opts=
fi
set -- \
-drive "if=none,id=${disk_id},file=${disk_path},snapshot=${SNAPSHOT}" \
-drive "if=none,id=${disk_id},file=${disk_path}${SNAPSHOT}" \
-device "virtio-blk-pci,drive=${disk_id}${disk_opts:+,}${disk_opts:-}" \
"${@}"
done
Expand All @@ -324,7 +324,7 @@ fi
if [ -n "${VM_PFLASH_RO}" ] && [ -n "${VM_PFLASH_RW}" ]; then
set -- \
-drive if=pflash,unit=0,file="${VM_PFLASH_RO}",format=qcow2,readonly=on \
-drive if=pflash,unit=1,file="${VM_PFLASH_RW}",format=qcow2,snapshot="${SNAPSHOT}" "$@"
-drive if=pflash,unit=1,file="${VM_PFLASH_RW}",format=qcow2"${SNAPSHOT}" "$@"
fi

if [ -n "${IGNITION_CONFIG_FILE}" ]; then
Expand Down
Loading