diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-23 08:17:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 08:17:47 -0700 |
| commit | 02a76a82b6860739ecd656b20817bbd2bd2c47ee (patch) | |
| tree | 7ae90cce55602fae03535d18423deb966d4f8355 /libpod | |
| parent | f09f9be43cc176892214a94e0fc5c0cae18898ab (diff) | |
| parent | fba494de8e3ac9c5b5d316d1cd3041f461e89ef2 (diff) | |
| download | podman-02a76a82b6860739ecd656b20817bbd2bd2c47ee.tar.gz podman-02a76a82b6860739ecd656b20817bbd2bd2c47ee.tar.bz2 podman-02a76a82b6860739ecd656b20817bbd2bd2c47ee.zip | |
Merge pull request #1686 from mheon/rootless_firewall
Use more reliable check for rootless for firewall init
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/runtime.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index f012d66c2..1b26f851f 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -508,7 +508,7 @@ func makeRuntime(runtime *Runtime) (err error) { // Set up a firewall backend backendType := "" - if os.Geteuid() != 0 { + if rootless.IsRootless() { backendType = "none" } fwBackend, err := firewall.GetBackend(backendType) |