Skip to content

fix up vm parameters #676

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
zhouhao3 merged 2 commits into from
Jan 9, 2019
Merged

fix up vm parameters #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1c11da
fix up vm parameters
tych0 Dec 14, 2018
1f0579c
hack: drop -dev from runtime-spec version
tych0 Jan 8, 2019
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 Godeps/Godeps.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions cmd/oci-runtime-tool/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ var generateFlags = []cli.Flag{
cli.StringFlag{Name: "solaris-max-shm-memory", Usage: "Specifies the maximum amount of shared memory"},
cli.StringFlag{Name: "solaris-milestone", Usage: "Specifies the SMF FMRI"},
cli.StringFlag{Name: "template", Usage: "base template to use for creating the configuration"},
cli.StringFlag{Name: "vm-hypervisor-parameters", Usage: "specifies an array of parameters to pass to the hypervisor"},
cli.StringSliceFlag{Name: "vm-hypervisor-parameters", Usage: "specifies an array of parameters to pass to the hypervisor"},
cli.StringFlag{Name: "vm-hypervisor-path", Usage: "specifies the path to the hypervisor binary that manages the container virtual machine"},
cli.StringFlag{Name: "vm-image-format", Usage: "set the format of the container virtual machine root image"},
cli.StringFlag{Name: "vm-image-path", Usage: "set path to the container virtual machine root image"},
cli.StringFlag{Name: "vm-kernel-initrd", Usage: "set path to an initial ramdisk to be used by the container virtual machine"},
cli.StringFlag{Name: "vm-kernel-parameters", Usage: "specifies an array of parameters to pass to the kernel"},
cli.StringSliceFlag{Name: "vm-kernel-parameters", Usage: "specifies an array of parameters to pass to the kernel"},
cli.StringFlag{Name: "vm-kernel-path", Usage: "set path to the kernel used to boot the container virtual machine"},
cli.StringSliceFlag{Name: "windows-devices", Usage: "specifies a list of devices to be mapped into the container"},
cli.StringFlag{Name: "windows-hyperv-utilityVMPath", Usage: "specifies the path to the image used for the utility VM"},
Expand Down Expand Up @@ -899,7 +899,7 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
}

if context.IsSet("vm-hypervisor-parameters") {
g.SetVMHypervisorParameters(context.String("vm-hypervisor-parameters"))
g.SetVMHypervisorParameters(context.StringSlice("vm-hypervisor-parameters"))
}

if context.IsSet("vm-kernel-path") {
Expand All @@ -909,7 +909,7 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
}

if context.IsSet("vm-kernel-parameters") {
g.SetVMKernelParameters(context.String("vm-kernel-parameters"))
g.SetVMKernelParameters(context.StringSlice("vm-kernel-parameters"))
}

if context.IsSet("vm-kernel-initrd") {
Expand Down
4 changes: 2 additions & 2 deletions generate/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1643,7 +1643,7 @@ func (g *Generator) SetVMHypervisorPath(path string) error {
}

// SetVMHypervisorParameters sets g.Config.VM.Hypervisor.Parameters
func (g *Generator) SetVMHypervisorParameters(parameters string) {
func (g *Generator) SetVMHypervisorParameters(parameters []string) {
g.initConfigVMHypervisor()
g.Config.VM.Hypervisor.Parameters = parameters
}
Expand All @@ -1659,7 +1659,7 @@ func (g *Generator) SetVMKernelPath(path string) error {
}

// SetVMKernelParameters sets g.Config.VM.Kernel.Parameters
func (g *Generator) SetVMKernelParameters(parameters string) {
func (g *Generator) SetVMKernelParameters(parameters []string) {
g.initConfigVMKernel()
g.Config.VM.Kernel.Parameters = parameters
}
Expand Down
20 changes: 14 additions & 6 deletions vendor/github.com/opencontainers/runtime-spec/specs-go/config.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.