containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1686 from mheon/rootless_firewall 

Use more reliable check for rootless for firewall init
This commit is contained in:
OpenShift Merge Robot 2018-10-23 08:17:47 -07:00 committed by GitHub
parent f09f9be43c fba494de8e
commit 02a76a82b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/runtime.go
View File

@ -508,7 +508,7 @@ func makeRuntime(runtime *Runtime) (err error) {
// Set up a firewall backend // Set up a firewall backend
backendType := "" backendType := ""
if os.Geteuid() != 0 { if rootless.IsRootless() {
backendType = "none" backendType = "none"
} }
fwBackend, err := firewall.GetBackend(backendType) fwBackend, err := firewall.GetBackend(backendType)