diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-08 16:58:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 16:58:50 +0100 |
| commit | c6ad42a176c943aa96a8c053682196cd38fd6a1a (patch) | |
| tree | ef71ccbda94462f1bee19e8153c361751813df8a /libpod/config/default.go | |
| parent | 27caffbb240725255485deaaecd548663adbf1fd (diff) | |
| parent | bcf5753276fcb7280924b46c7c49ef3e2388c9b0 (diff) | |
| download | podman-c6ad42a176c943aa96a8c053682196cd38fd6a1a.tar.gz podman-c6ad42a176c943aa96a8c053682196cd38fd6a1a.tar.bz2 podman-c6ad42a176c943aa96a8c053682196cd38fd6a1a.zip | |
Merge pull request #4816 from vrothberg/lint
Fix golint errors
Diffstat (limited to 'libpod/config/default.go')
| -rw-r--r-- | libpod/config/default.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libpod/config/default.go b/libpod/config/default.go index 5decaeab7..c4a4efdaf 100644 --- a/libpod/config/default.go +++ b/libpod/config/default.go @@ -26,11 +26,12 @@ const ( // config is different for root and rootless. It also parses the storage.conf. func defaultConfigFromMemory() (*Config, error) { c := new(Config) - if tmp, err := defaultTmpDir(); err != nil { + tmp, err := defaultTmpDir() + if err != nil { return nil, err - } else { - c.TmpDir = tmp } + c.TmpDir = tmp + c.EventsLogFilePath = filepath.Join(c.TmpDir, "events", "events.log") storeOpts, err := storage.DefaultStoreOptions(rootless.IsRootless(), rootless.GetRootlessUID()) |