diff options
| author | Sebastiaan van Stijn <github@gone.nl> | 2022-10-17 13:47:56 +0200 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2022-10-17 15:22:10 +0200 |
| commit | 19c5d21e6fb5af875a8247eb06bed79a15000545 (patch) | |
| tree | 7f80386025e63ae7026679bb0256b6e6357b8890 /daemon/daemon.go | |
| parent | d006242d737843977ca751711a13df77c813b0a0 (diff) | |
| download | docker-19c5d21e6fb5af875a8247eb06bed79a15000545.tar.gz | |
daemon: getPluginExecRoot(): pass config
This makes it more transparent that it's unused for Linux,
and we don't pass "root", which has no relation with the
path on Linux.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'daemon/daemon.go')
| -rw-r--r-- | daemon/daemon.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/daemon/daemon.go b/daemon/daemon.go index 272ab6bc5c..d988035079 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -903,13 +903,13 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S } rt = *rtPtr } - return pluginexec.New(ctx, getPluginExecRoot(config.Root), pluginCli, config.ContainerdPluginNamespace, m, rt) + return pluginexec.New(ctx, getPluginExecRoot(config), pluginCli, config.ContainerdPluginNamespace, m, rt) } // Plugin system initialization should happen before restore. Do not change order. d.pluginManager, err = plugin.NewManager(plugin.ManagerConfig{ Root: filepath.Join(config.Root, "plugins"), - ExecRoot: getPluginExecRoot(config.Root), + ExecRoot: getPluginExecRoot(config), Store: d.PluginStore, CreateExecutor: createPluginExec, RegistryService: registryService, |