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 vmtype to make more sense, add ostype #381

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
15 changes: 10 additions & 5 deletions src/vm/man/vmadm.1m.md
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,11 @@ tab-complete UUIDs rather than having to type them out for every command.

type -- type of the properties value.

vmtype -- types of VM (KVM, LX, OS) for which this property applies.
vmtype -- types of VM (KVM, OS) for which this property applies.

ostype -- type of os (lx, joyent, joyent-minimal or sngl) for which
this property applies. It applies to all of them if it
is missing.

listable -- if they can be included in the -o or -s lists for the
'vmadm list' command.
Expand Down Expand Up @@ -604,7 +608,7 @@ tab-complete UUIDs rather than having to type them out for every command.
virtualization and 'kvm' for full hardware virtualization. This is a
required value for VM creation.

type: string (joyent|joyent-minimal|kvm|sngl)
type: string (joyent|joyent-minimal|kvm|sngl|lx)
vmtype: OS,KVM
listable: yes
create: yes
Expand Down Expand Up @@ -1118,7 +1122,7 @@ tab-complete UUIDs rather than having to type them out for every command.
and allow the VM to be deleted.

type: boolean
vmtype: KVM,LX,OS
vmtype: OS,KVM
listable: yes
create: yes
update: yes
Expand All @@ -1142,7 +1146,7 @@ tab-complete UUIDs rather than having to type them out for every command.
deleted.

type: boolean
vmtype: KVM,LX,OS
vmtype: OS,KVM
listable: yes
create: yes
update: yes
Expand All @@ -1153,7 +1157,8 @@ tab-complete UUIDs rather than having to type them out for every command.
This sets the version of Linux to emulate for LX VMs.

type: string (kernel version, eg. 2.6.31)
vmtype: LX
vmtype: OS
ostype: lx
listable: no
create: no
update: yes
Expand Down