diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2018-06-11 16:03:34 +0200 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-27 14:07:17 +0000 |
| commit | 5ff90677c83b78366554493e10f7615119f7e0a1 (patch) | |
| tree | 094685755b891f5813a458cfadb5374e68f732fb /libpod/runtime.go | |
| parent | 8ee8f847340c3ac2264e183655fb7cdcbbfbb2cd (diff) | |
| download | podman-5ff90677c83b78366554493e10f7615119f7e0a1.tar.gz podman-5ff90677c83b78366554493e10f7615119f7e0a1.tar.bz2 podman-5ff90677c83b78366554493e10f7615119f7e0a1.zip | |
rootless: add management for the userNS
When running podman as non root user always create an userNS and let
the OCI runtime use it.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Closes: #936
Approved by: rhatdan
Diffstat (limited to 'libpod/runtime.go')
| -rw-r--r-- | libpod/runtime.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 21dd9d024..338a2b436 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -19,6 +19,7 @@ import ( "github.com/projectatomic/libpod/libpod/image" "github.com/projectatomic/libpod/pkg/hooks" sysreg "github.com/projectatomic/libpod/pkg/registries" + "github.com/projectatomic/libpod/pkg/rootless" "github.com/sirupsen/logrus" "github.com/ulule/deepcopier" ) @@ -197,7 +198,7 @@ func GetRootlessRuntimeDir() string { } func getDefaultTmpDir() string { - if os.Getuid() == 0 { + if !rootless.IsRootless() { return "/var/run/libpod" } @@ -216,7 +217,7 @@ func NewRuntime(options ...RuntimeOption) (runtime *Runtime, err error) { configPath := ConfigPath foundConfig := true - if os.Getuid() != 0 { + if rootless.IsRootless() { foundConfig = false } else if _, err := os.Stat(OverrideConfigPath); err == nil { // Use the override configuration path |