diff --git a/components/engine/daemon/info.go b/components/engine/daemon/info.go index 04607fe241..1ee367add1 100644 --- a/components/engine/daemon/info.go +++ b/components/engine/daemon/info.go @@ -75,8 +75,8 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) { DriverStatus: daemon.layerStore.DriverStatus(), Plugins: daemon.showPluginsInfo(), IPv4Forwarding: !sysInfo.IPv4ForwardingDisabled, - BridgeNfIptables: !sysInfo.BridgeNfCallIptablesDisabled, - BridgeNfIP6tables: !sysInfo.BridgeNfCallIP6tablesDisabled, + BridgeNfIptables: !sysInfo.BridgeNFCallIPTablesDisabled, + BridgeNfIP6tables: !sysInfo.BridgeNFCallIP6TablesDisabled, Debug: utils.IsDebugEnabled(), NFd: fileutils.GetTotalUsedFds(), NGoroutines: runtime.NumGoroutine(), diff --git a/components/engine/integration-cli/requirements_unix.go b/components/engine/integration-cli/requirements_unix.go index 2e1d02c1ce..f625985b0a 100644 --- a/components/engine/integration-cli/requirements_unix.go +++ b/components/engine/integration-cli/requirements_unix.go @@ -83,13 +83,13 @@ var ( } bridgeNfIptables = testRequirement{ func() bool { - return !SysInfo.BridgeNfCallIptablesDisabled + return !SysInfo.BridgeNFCallIPTablesDisabled }, "Test requires that bridge-nf-call-iptables support be enabled in the daemon.", } bridgeNfIP6tables = testRequirement{ func() bool { - return !SysInfo.BridgeNfCallIP6tablesDisabled + return !SysInfo.BridgeNFCallIP6TablesDisabled }, "Test requires that bridge-nf-call-ip6tables support be enabled in the daemon.", } diff --git a/components/engine/pkg/sysinfo/sysinfo.go b/components/engine/pkg/sysinfo/sysinfo.go index 285b3ba58f..3adaa9454b 100644 --- a/components/engine/pkg/sysinfo/sysinfo.go +++ b/components/engine/pkg/sysinfo/sysinfo.go @@ -19,10 +19,10 @@ type SysInfo struct { IPv4ForwardingDisabled bool // Whether bridge-nf-call-iptables is supported or not - BridgeNfCallIptablesDisabled bool + BridgeNFCallIPTablesDisabled bool // Whether bridge-nf-call-ip6tables is supported or not - BridgeNfCallIP6tablesDisabled bool + BridgeNFCallIP6TablesDisabled bool // Whether the cgroup has the mountpoint of "devices" or not CgroupDevicesEnabled bool diff --git a/components/engine/pkg/sysinfo/sysinfo_linux.go b/components/engine/pkg/sysinfo/sysinfo_linux.go index 766d13d4d9..7f584bbbdc 100644 --- a/components/engine/pkg/sysinfo/sysinfo_linux.go +++ b/components/engine/pkg/sysinfo/sysinfo_linux.go @@ -50,8 +50,8 @@ func New(quiet bool) *SysInfo { sysInfo.CgroupDevicesEnabled = ok sysInfo.IPv4ForwardingDisabled = !readProcBool("/proc/sys/net/ipv4/ip_forward") - sysInfo.BridgeNfCallIptablesDisabled = !readProcBool("/proc/sys/net/bridge/bridge-nf-call-iptables") - sysInfo.BridgeNfCallIP6tablesDisabled = !readProcBool("/proc/sys/net/bridge/bridge-nf-call-ip6tables") + sysInfo.BridgeNFCallIPTablesDisabled = !readProcBool("/proc/sys/net/bridge/bridge-nf-call-iptables") + sysInfo.BridgeNFCallIP6TablesDisabled = !readProcBool("/proc/sys/net/bridge/bridge-nf-call-ip6tables") // Check if AppArmor is supported. if _, err := os.Stat("/sys/kernel/security/apparmor"); !os.IsNotExist(err) {