aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd/podman/create.go4
-rw-r--r--cmd/podman/run.go4
2 files changed, 8 insertions, 0 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index 07e75ad3a..39f6076b9 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -61,6 +61,10 @@ func createCmd(c *cli.Context) error {
return err
}
+ if os.Geteuid() != 0 {
+ rootless.SetSkipStorageSetup(true)
+ }
+
runtime, err := libpodruntime.GetContainerRuntime(c)
if err != nil {
return errors.Wrapf(err, "error creating libpod runtime")
diff --git a/cmd/podman/run.go b/cmd/podman/run.go
index 2a031de05..ce7d0c40f 100644
--- a/cmd/podman/run.go
+++ b/cmd/podman/run.go
@@ -10,6 +10,7 @@ import (
"github.com/containers/libpod/cmd/podman/libpodruntime"
"github.com/containers/libpod/libpod"
+ "github.com/containers/libpod/pkg/rootless"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
@@ -39,6 +40,9 @@ func runCmd(c *cli.Context) error {
if err := createInit(c); err != nil {
return err
}
+ if os.Geteuid() != 0 {
+ rootless.SetSkipStorageSetup(true)
+ }
runtime, err := libpodruntime.GetContainerRuntime(c)
if err != nil {