mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Remove unsupported lcow.vhdx option
Signed-off-by: John Howard <jhoward@microsoft.com> This was only experimental and removed from opengcs. Making same change in docker.
This commit is contained in:
parent
0a30ef4c59
commit
8de5db1c00
3 changed files with 2 additions and 17 deletions
|
@ -43,10 +43,6 @@
|
||||||
// -- Possible values: Any valid linux kernel boot options
|
// -- Possible values: Any valid linux kernel boot options
|
||||||
// -- Default if omitted: <nil>
|
// -- Default if omitted: <nil>
|
||||||
//
|
//
|
||||||
// * lcow.vhdx - Specifies a custom vhdx file to boot (instead of a kernel+initrd)
|
|
||||||
// -- Possible values: Any valid filename
|
|
||||||
// -- Default if omitted: uvm.vhdx under `lcow.kirdpath`
|
|
||||||
//
|
|
||||||
// * lcow.timeout - Specifies a timeout for utility VM operations in seconds
|
// * lcow.timeout - Specifies a timeout for utility VM operations in seconds
|
||||||
// -- Possible values: >=0
|
// -- Possible values: >=0
|
||||||
// -- Default if omitted: 300
|
// -- Default if omitted: 300
|
||||||
|
|
|
@ -33,8 +33,6 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain
|
||||||
config.KernelFile = v
|
config.KernelFile = v
|
||||||
case "lcow.initrd":
|
case "lcow.initrd":
|
||||||
config.InitrdFile = v
|
config.InitrdFile = v
|
||||||
case "lcow.vhdx":
|
|
||||||
config.Vhdx = v
|
|
||||||
case "lcow.bootparameters":
|
case "lcow.bootparameters":
|
||||||
config.BootParameters = v
|
config.BootParameters = v
|
||||||
}
|
}
|
||||||
|
|
|
@ -393,21 +393,12 @@ func (c *client) createLinux(id string, spec *specs.Spec, runtimeOptions interfa
|
||||||
ContainerType: "linux",
|
ContainerType: "linux",
|
||||||
Owner: defaultOwner,
|
Owner: defaultOwner,
|
||||||
TerminateOnLastHandleClosed: true,
|
TerminateOnLastHandleClosed: true,
|
||||||
}
|
HvRuntime: &hcsshim.HvRuntime{
|
||||||
|
|
||||||
if lcowConfig.ActualMode == opengcs.ModeActualVhdx {
|
|
||||||
configuration.HvRuntime = &hcsshim.HvRuntime{
|
|
||||||
ImagePath: lcowConfig.Vhdx,
|
|
||||||
BootSource: "Vhd",
|
|
||||||
WritableBootSource: false,
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
configuration.HvRuntime = &hcsshim.HvRuntime{
|
|
||||||
ImagePath: lcowConfig.KirdPath,
|
ImagePath: lcowConfig.KirdPath,
|
||||||
LinuxKernelFile: lcowConfig.KernelFile,
|
LinuxKernelFile: lcowConfig.KernelFile,
|
||||||
LinuxInitrdFile: lcowConfig.InitrdFile,
|
LinuxInitrdFile: lcowConfig.InitrdFile,
|
||||||
LinuxBootParameters: lcowConfig.BootParameters,
|
LinuxBootParameters: lcowConfig.BootParameters,
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
if spec.Windows == nil {
|
if spec.Windows == nil {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue