diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-12 16:53:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-12 16:53:46 +0200 |
| commit | ec93c9d8753c1cf346fe7fee3035af1a0dcf9b55 (patch) | |
| tree | 37a407bad913399b31b543db9caa7dbb5e13a232 /pkg | |
| parent | f18cfa47686a30166cfe6f743dbda0e13575e4f2 (diff) | |
| parent | 9e2f9c8b7804cec7ed7bcf595272de976f799ef6 (diff) | |
| download | podman-ec93c9d8753c1cf346fe7fee3035af1a0dcf9b55.tar.gz podman-ec93c9d8753c1cf346fe7fee3035af1a0dcf9b55.tar.bz2 podman-ec93c9d8753c1cf346fe7fee3035af1a0dcf9b55.zip | |
Merge pull request #3786 from giuseppe/fix-rootless-checks
rootless: drop some superflous checks
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/spec/storage.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/pkg/spec/storage.go b/pkg/spec/storage.go index e0bb48a9c..a8dc7f4a8 100644 --- a/pkg/spec/storage.go +++ b/pkg/spec/storage.go @@ -238,11 +238,6 @@ func (config *CreateConfig) parseVolumes(runtime *libpod.Runtime) ([]spec.Mount, // Conflicts are resolved simply - the last container specified wins. // Container names may be suffixed by mount options after a colon. func (config *CreateConfig) getVolumesFrom(runtime *libpod.Runtime) (map[string]spec.Mount, map[string]*libpod.ContainerNamedVolume, error) { - // TODO: This can probably be disabled now - if os.Geteuid() != 0 { - return nil, nil, nil - } - // Both of these are maps of mount destination to mount type. // We ensure that each destination is only mounted to once in this way. finalMounts := make(map[string]spec.Mount) |