Skip to content

run: Add --disk-channel opt, support nvme #906

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
merged 1 commit into from
Nov 8, 2019
Merged

run: Add --disk-channel opt, support nvme #906

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
11 changes: 10 additions & 1 deletion src/cmd-run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ dn=$(dirname "$0")
BUILDID=latest
IMAGE_TYPE=qemu
VM_DISK=
DISK_CHANNEL=virtio
VM_MEMORY=2048
VM_DISKSIZE=
VM_PERSIST_IMG=
Expand All @@ -33,6 +34,7 @@ Options:
-b --buildid Target buildid (default latest)
-I --imgtype Target image type (qemu, metal, etc. Default qemu)
-d DISK Root disk drive (won't be changed by default)
--disk-channel TYPE Communication mechanism for root device: virtio, nvme
--persist-to-img IMG Persist changes to a separate image
-i FILE File containing an Ignition config to merge into the default config
--srv src Mount (via 9p) src on the host as /var/srv in guest
Expand Down Expand Up @@ -75,6 +77,9 @@ while [ $# -ge 1 ]; do
-d)
VM_DISK="$2"
shift 2 ;;
--disk-channel)
DISK_CHANNEL="$2"
shift 2 ;;
--persist-to-img)
VM_PERSIST_IMG="$2"
shift 2 ;;
Expand Down Expand Up @@ -368,7 +373,11 @@ Host coreos
EOF
fi

set -- -drive if=virtio,file="${VM_IMG}" "$@"
case "${DISK_CHANNEL}" in
virtio) set -- -drive if=virtio,file="${VM_IMG}" "$@" ;;
nvme) set -- -device nvme,drive=D22,serial=1234 -drive file="${VM_IMG}",if=none,id=D22 "$@" ;;
*) die "Invalid --disk-channel ${DISK_CHANNEL}" ;;
esac

# There is no BIOS on aarch64, so we need a firmware to boot the system
if [ "$(arch)" == "aarch64" ]; then
Expand Down