From 19a938f6bc7450231da086255d0273836b08644d Mon Sep 17 00:00:00 2001 From: John Howard Date: Tue, 12 Mar 2019 19:31:06 -0700 Subject: [PATCH] LCOWv1:Remote lcow.kernel and lcow.initrd Signed-off-by: John Howard LCOWv1 will be deprecated soon anyway (and LCOW is experimental regardless). Removing lcow.initrd and lcow.kernel options which will not be supported in LCOWv2 (via containerd). --- daemon/graphdriver/lcow/lcow.go | 8 -------- daemon/start_windows.go | 4 ---- 2 files changed, 12 deletions(-) diff --git a/daemon/graphdriver/lcow/lcow.go b/daemon/graphdriver/lcow/lcow.go index 5b50c0cd36..cd9033b068 100644 --- a/daemon/graphdriver/lcow/lcow.go +++ b/daemon/graphdriver/lcow/lcow.go @@ -31,14 +31,6 @@ // -- Possible values: Any local path that is not a mapped drive // -- Default if omitted: %ProgramFiles%\Linux Containers // -// * lcow.kernel - Specifies a custom kernel file located in the `lcow.kirdpath` path -// -- Possible values: Any valid filename -// -- Default if omitted: bootx64.efi -// -// * lcow.initrd - Specifies a custom initrd file located in the `lcow.kirdpath` path -// -- Possible values: Any valid filename -// -- Default if omitted: initrd.img -// // * lcow.bootparameters - Specifies additional boot parameters for booting in kernel+initrd mode // -- Possible values: Any valid linux kernel boot options // -- Default if omitted: diff --git a/daemon/start_windows.go b/daemon/start_windows.go index abe84c565a..cfb3f73570 100644 --- a/daemon/start_windows.go +++ b/daemon/start_windows.go @@ -29,10 +29,6 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain switch k { case "lcow.kirdpath": config.KirdPath = v - case "lcow.kernel": - config.KernelFile = v - case "lcow.initrd": - config.InitrdFile = v case "lcow.bootparameters": config.BootParameters = v }