diff options
Diffstat (limited to 'daemon/daemon.go')
| -rw-r--r-- | daemon/daemon.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/daemon/daemon.go b/daemon/daemon.go index 8a11fa5faa..f139fc6d83 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -794,6 +794,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S PluginStore: pluginStore, startupDone: make(chan struct{}), } + // Ensure the daemon is properly shutdown if there is a failure during // initialization defer func() { @@ -914,7 +915,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S } } - return pluginexec.New(ctx, getPluginExecRoot(config.Root), pluginCli, config.ContainerdPluginNamespace, m) + return pluginexec.New(ctx, getPluginExecRoot(config.Root), pluginCli, config.ContainerdPluginNamespace, m, d.useShimV2()) } // Plugin system initialization should happen before restore. Do not change order. @@ -1063,7 +1064,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S go d.execCommandGC() - d.containerd, err = libcontainerd.NewClient(ctx, d.containerdCli, filepath.Join(config.ExecRoot, "containerd"), config.ContainerdNamespace, d) + d.containerd, err = libcontainerd.NewClient(ctx, d.containerdCli, filepath.Join(config.ExecRoot, "containerd"), config.ContainerdNamespace, d, d.useShimV2()) if err != nil { return nil, err } |