summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-10-31 13:50:25 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2018-10-31 13:58:55 +0100
commit89e9067decc05aca92c47ab73af1f7ea95080d0e (patch)
treea68d8a65bb1a67d255ce0f509aad6e1d99abbff1 /pkg
parentee513cca8612bebfda36e31203ab215aa682e8c0 (diff)
downloadpodman-89e9067decc05aca92c47ab73af1f7ea95080d0e.tar.gz
podman-89e9067decc05aca92c47ab73af1f7ea95080d0e.tar.bz2
podman-89e9067decc05aca92c47ab73af1f7ea95080d0e.zip
rootless: do not add an additional /run to runroot
we are currently using something like /run/user/UID/run as runroot, as it is already done by Buildah. This ends up with /run/user/UID/run/runc for the runc directory. Change to drop the additional /run so that runc will use /run/user/UID/runc. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/util/utils.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/util/utils.go b/pkg/util/utils.go
index 9107eec5c..69f49e72a 100644
--- a/pkg/util/utils.go
+++ b/pkg/util/utils.go
@@ -256,7 +256,7 @@ func GetRootlessStorageOpts() (storage.StoreOptions, error) {
if err != nil {
return opts, err
}
- opts.RunRoot = filepath.Join(rootlessRuntime, "run")
+ opts.RunRoot = rootlessRuntime
dataDir := os.Getenv("XDG_DATA_HOME")
if dataDir == "" {