diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-03 07:03:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 07:03:16 -0700 |
| commit | 230edff5216d0a7cedeff06c891450f8691b5aa2 (patch) | |
| tree | 56147c11769b5586a6a2afbf6357caf59d1b8318 /cmd/podman | |
| parent | a3c4ce6717cab56d968fbe1fff0ced19f45c23cb (diff) | |
| parent | 2f73a9b0f6225819fb8bf53d103438ddf4421441 (diff) | |
| download | podman-230edff5216d0a7cedeff06c891450f8691b5aa2.tar.gz podman-230edff5216d0a7cedeff06c891450f8691b5aa2.tar.bz2 podman-230edff5216d0a7cedeff06c891450f8691b5aa2.zip | |
Merge pull request #1580 from giuseppe/rootless-always-set-XDG_RUNTIME_DIR
rootless: always set XDG_RUNTIME_DIR
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/main.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go index 840650a3f..d4c8454a8 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -7,6 +7,7 @@ import ( "runtime/pprof" "syscall" + "github.com/containers/libpod/libpod" "github.com/containers/libpod/pkg/hooks" _ "github.com/containers/libpod/pkg/hooks/0.1.0" "github.com/containers/libpod/pkg/rootless" @@ -109,6 +110,10 @@ func main() { } app.Before = func(c *cli.Context) error { + if err := libpod.SetXdgRuntimeDir(""); err != nil { + logrus.Errorf(err.Error()) + os.Exit(1) + } args := c.Args() if args.Present() { if _, notRequireRootless := cmdsNotRequiringRootless[args.First()]; !notRequireRootless { |