diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-02-25 15:37:20 -0500 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-02-26 09:38:02 -0500 |
| commit | ba6f1acf07d1eddcd810cdb4265a8961770329c6 (patch) | |
| tree | db668a42dce8b260e93ea95be48404ba2c87d06f | |
| parent | 5a0a9dfa23900f0bf1c53cf5d6d34a665616129e (diff) | |
| download | podman-ba6f1acf07d1eddcd810cdb4265a8961770329c6.tar.gz podman-ba6f1acf07d1eddcd810cdb4265a8961770329c6.tar.bz2 podman-ba6f1acf07d1eddcd810cdb4265a8961770329c6.zip | |
Record when volume path is explicitly set in config
This ensures we won't overwrite it when it's set in the config we
load from disk.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| -rw-r--r-- | libpod/runtime.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index eb9eb9e83..827c22f5b 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -405,6 +405,9 @@ func NewRuntime(options ...RuntimeOption) (runtime *Runtime, err error) { if tmpConfig.TmpDir != "" { runtime.configuredFrom.libpodTmpDirSet = true } + if tmpConfig.VolumePath != "" { + runtime.configuredFrom.volPathSet = true + } if _, err := toml.Decode(string(contents), runtime.config); err != nil { return nil, errors.Wrapf(err, "error decoding configuration file %s", configPath) |