fix up vm parameters

with opencontainers/runtime-spec@fc51617

the runtime tools need to change as well to update the type. Do the
simplest thing and simply allow multiple instances of the same argument to
populate the array.

Signed-off-by: Tycho Andersen <[email protected]>

Author: tych0

Godeps/Godeps.json

@@ -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"},
@@ -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") {
@@ -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") {

cmd/oci-runtime-tool/generate.go

@@ -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
 }
@@ -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
 }