diff options
| author | Matthew Heon <mheon@redhat.com> | 2018-12-02 15:21:35 -0500 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2018-12-02 15:21:35 -0500 |
| commit | 562fa57dc9f497db772baa03bfa052082db68646 (patch) | |
| tree | 47016e6dd700b37a896732ac83b6a6b9ad849b2d /cmd/podman/run.go | |
| parent | 92ff83f5b9dd00ff91dc8c3d6b48f1e0b5c5f3e2 (diff) | |
| download | podman-562fa57dc9f497db772baa03bfa052082db68646.tar.gz podman-562fa57dc9f497db772baa03bfa052082db68646.tar.bz2 podman-562fa57dc9f497db772baa03bfa052082db68646.zip | |
Move rootless storage config into libpod
Previous commits ensured that we would use database-configured
paths if not explicitly overridden.
However, our runtime generation did unconditionally override
storage config, which made this useless.
Move rootless storage configuration setup to libpod, and change
storage setup so we only override if a setting is explicitly
set, so we can still override what we want.
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'cmd/podman/run.go')
| -rw-r--r-- | cmd/podman/run.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/run.go b/cmd/podman/run.go index af6ced45d..a4b5c918e 100644 --- a/cmd/podman/run.go +++ b/cmd/podman/run.go @@ -44,7 +44,7 @@ func runCmd(c *cli.Context) error { rootless.SetSkipStorageSetup(true) } - runtime, err := libpodruntime.GetContainerRuntime(c) + runtime, err := libpodruntime.GetRuntime(c) if err != nil { return errors.Wrapf(err, "error creating libpod runtime") } |