Browse code

Remove unused useShimV2()

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2020/07/15 21:28:48
Showing 2 changed files
... ...
@@ -654,10 +654,6 @@ func (daemon *Daemon) initRuntimes(_ map[string]types.Runtime) error {
654 654
 func setupResolvConf(config *config.Config) {
655 655
 }
656 656
 
657
-func (daemon *Daemon) useShimV2() bool {
658
-	return true
659
-}
660
-
661 657
 // RawSysInfo returns *sysinfo.SysInfo .
662 658
 func (daemon *Daemon) RawSysInfo(quiet bool) *sysinfo.SysInfo {
663 659
 	return sysinfo.New(quiet)
... ...
@@ -13,7 +13,6 @@ import (
13 13
 // NewClient creates a new libcontainerd client from a containerd client
14 14
 func NewClient(ctx context.Context, cli *containerd.Client, stateDir, ns string, b libcontainerdtypes.Backend) (libcontainerdtypes.Client, error) {
15 15
 	if !system.ContainerdRuntimeSupported() {
16
-		// useShimV2 is ignored for windows
17 16
 		return local.NewClient(ctx, cli, stateDir, ns, b)
18 17
 	}
19 18
 	return remote.NewClient(ctx, cli, stateDir, ns, b)