diff options
| author | umohnani8 <umohnani@redhat.com> | 2018-04-26 16:41:06 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-04-27 14:07:54 +0000 |
| commit | 51a5cdc6366905cde09e8efb7afa06f51ef9c67b (patch) | |
| tree | a9b486e3dbc5229d35f88ffe58a0559bf3b3b190 /libpod | |
| parent | 39a7a773a653176e294382bc6301275fd57aff6b (diff) | |
| download | podman-51a5cdc6366905cde09e8efb7afa06f51ef9c67b.tar.gz podman-51a5cdc6366905cde09e8efb7afa06f51ef9c67b.tar.bz2 podman-51a5cdc6366905cde09e8efb7afa06f51ef9c67b.zip | |
Modify secrets pkg
Made a mistake in my earlier patch. I though that if you add an empty string
to an array, the length of the array would still be 0...
Realised this when vendoring the secrets pkg into cri-o.
Signed-off-by: umohnani8 <umohnani@redhat.com>
Closes: #685
Approved by: mheon
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/options.go | 5 | ||||
| -rw-r--r-- | libpod/runtime.go | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libpod/options.go b/libpod/options.go index 202cfe9a3..981ca9a9d 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -194,7 +194,10 @@ func WithDefaultMountsFile(mountsFile string) RuntimeOption { return ErrRuntimeFinalized } - rt.config.DefaultMountsFile = []string{mountsFile} + if mountsFile == "" { + return ErrInvalidArg + } + rt.config.DefaultMountsFile = mountsFile return nil } } diff --git a/libpod/runtime.go b/libpod/runtime.go index f46fc8851..9de70da1b 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -132,7 +132,7 @@ type RuntimeConfig struct { // HooksDir Path to the directory containing hooks configuration files HooksDir string `toml:"hooks_dir"` // DefaultMountsFile is the path to the default mounts file for testing purposes only - DefaultMountsFile []string `toml:"-"` + DefaultMountsFile string `toml:"-"` } var ( |