diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-03-19 10:59:43 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-04-01 13:24:04 +0200 |
| commit | ed326206f2b0ed80cdeddc63430bfbe60016c7df (patch) | |
| tree | 84d3430711744e68f1217d71ed8316337c366ef2 /cmd/podman/shared | |
| parent | cd35e20772a324e5dd247496705bef57b9da752d (diff) | |
| download | podman-ed326206f2b0ed80cdeddc63430bfbe60016c7df.tar.gz podman-ed326206f2b0ed80cdeddc63430bfbe60016c7df.tar.bz2 podman-ed326206f2b0ed80cdeddc63430bfbe60016c7df.zip | |
rootless: remove SkipStorageSetup()
in the few places where we care about skipping the storage
initialization, we can simply use the process effective UID, instead
of relying on a global boolean flag.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'cmd/podman/shared')
| -rw-r--r-- | cmd/podman/shared/create.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go index d927e5bf6..32ab088b4 100644 --- a/cmd/podman/shared/create.go +++ b/cmd/podman/shared/create.go @@ -75,7 +75,8 @@ func CreateContainer(ctx context.Context, c *cliconfig.PodmanCommand, runtime *l imageName := "" var data *inspect.ImageData = nil - if rootfs == "" && !rootless.SkipStorageSetup() { + // Set the storage if we are running as euid == 0 and there is no rootfs specified + if rootfs == "" && os.Geteuid() == 0 { var writer io.Writer if !c.Bool("quiet") { writer = os.Stderr |