beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove unused useShimV2()

Browse source 
This function was removed in the Linux code as part of
f63f73a4a8, but was not removed in
the Windows code.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-07-15 14:28:48 +02:00
parent 61b73ee714
commit bf7fd015f7
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/daemon_windows.go
View file

@ -654,10 +654,6 @@ func (daemon *Daemon) initRuntimes(_ map[string]types.Runtime) error {
func setupResolvConf(config *config.Config) { func setupResolvConf(config *config.Config) {
} }
func (daemon *Daemon) useShimV2() bool {
return true
}
// RawSysInfo returns *sysinfo.SysInfo . // RawSysInfo returns *sysinfo.SysInfo .
func (daemon *Daemon) RawSysInfo(quiet bool) *sysinfo.SysInfo { func (daemon *Daemon) RawSysInfo(quiet bool) *sysinfo.SysInfo {
return sysinfo.New(quiet) return sysinfo.New(quiet)

1
libcontainerd/libcontainerd_windows.go
View file

@ -13,7 +13,6 @@ import (
// NewClient creates a new libcontainerd client from a containerd client // NewClient creates a new libcontainerd client from a containerd client
func NewClient(ctx context.Context, cli *containerd.Client, stateDir, ns string, b libcontainerdtypes.Backend) (libcontainerdtypes.Client, error) { func NewClient(ctx context.Context, cli *containerd.Client, stateDir, ns string, b libcontainerdtypes.Backend) (libcontainerdtypes.Client, error) {
if !system.ContainerdRuntimeSupported() { if !system.ContainerdRuntimeSupported() {
// useShimV2 is ignored for windows
return local.NewClient(ctx, cli, stateDir, ns, b) return local.NewClient(ctx, cli, stateDir, ns, b)
} }
return remote.NewClient(ctx, cli, stateDir, ns, b) return remote.NewClient(ctx, cli, stateDir, ns, b)