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

View File

@ -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)