From 1f0f7f3e7d4766437f5ac2008d1dcf00686477c9 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Thu, 14 Dec 2017 14:36:27 -0500 Subject: Ensure libkpod.Config defaults don't override libpod defaults Signed-off-by: Matthew Heon Closes: #109 Approved by: mheon --- libpod/options.go | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'libpod') diff --git a/libpod/options.go b/libpod/options.go index 3020ef51a..8720c3639 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -251,16 +251,27 @@ func WithNoPivotRoot(noPivot bool) RuntimeOption { } } -// WithCNIDirs sets the CNI configuration and network plugin directories used by -// the CNI network plugins -func WithCNIDirs(cniConfigDir, cniPluginDir string) RuntimeOption { +// WithCNIConfigDir sets the CNI configuration directory +func WithCNIConfigDir(dir string) RuntimeOption { return func(rt *Runtime) error { if rt.valid { return ErrRuntimeFinalized } - rt.config.CNIConfigDir = cniConfigDir - rt.config.CNIPluginDir = cniPluginDir + rt.config.CNIConfigDir = dir + + return nil + } +} + +// WithCNIPluginDir sets the CNI plugins directory +func WithCNIPluginDir(dir string) RuntimeOption { + return func(rt *Runtime) error { + if rt.valid { + return ErrRuntimeFinalized + } + + rt.config.CNIPluginDir = dir return nil } -- cgit v1.2.3-54-g00ecf