Skip to content

Commit

Permalink
Merge pull request #815 from sammyshj/removedockerinit
Browse files Browse the repository at this point in the history
Removed dockerinit reference
  • Loading branch information
mrjana committed Dec 17, 2015
2 parents c8f435b + 66ab744 commit e6f7538
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/bridge/setup_bridgenetfiltering.go
Expand Up @@ -157,6 +157,6 @@ func isPacketForwardingEnabled(ipVer ipVersion, iface string) (bool, error) {
}

func isRunningInContainer() bool {
_, err := os.Stat("/.dockerinit")
_, err := os.Stat("/.dockerenv")
return !os.IsNotExist(err)
}

0 comments on commit e6f7538

Please sign in to comment.