浏览代码

Merge pull request #8963 from blakery/master

Cleanup: made GetDefaultNetworkMtu private
Michael Crosby 10 年之前
父节点
当前提交
dd62d256cb
共有 3 个文件被更改,包括 2 次插入7 次删除
  1. 1 1
      daemon/config.go
  2. 1 2
      daemon/daemon.go
  3. 0 4
      integration/utils_test.go

+ 1 - 1
daemon/config.go

@@ -70,7 +70,7 @@ func (config *Config) InstallFlags() {
 	opts.MirrorListVar(&config.Mirrors, []string{"-registry-mirror"}, "Specify a preferred Docker registry mirror")
 }
 
-func GetDefaultNetworkMtu() int {
+func getDefaultNetworkMtu() int {
 	if iface, err := networkdriver.GetDefaultRouteIface(); err == nil {
 		return iface.MTU
 	}

+ 1 - 2
daemon/daemon.go

@@ -721,8 +721,7 @@ func NewDaemon(config *Config, eng *engine.Engine) (*Daemon, error) {
 func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error) {
 	// Apply configuration defaults
 	if config.Mtu == 0 {
-		// FIXME: GetDefaultNetwork Mtu doesn't need to be public anymore
-		config.Mtu = GetDefaultNetworkMtu()
+		config.Mtu = getDefaultNetworkMtu()
 	}
 	// Check for mutually incompatible config options
 	if config.BridgeIface != "" && config.BridgeIP != "" {

+ 0 - 4
integration/utils_test.go

@@ -37,10 +37,6 @@ type Fataler interface {
 func mkDaemon(f Fataler) *daemon.Daemon {
 	eng := newTestEngine(f, false, "")
 	return mkDaemonFromEngine(eng, f)
-	// FIXME:
-	// [...]
-	// Mtu:         docker.GetDefaultNetworkMtu(),
-	// [...]
 }
 
 func createNamedTestContainer(eng *engine.Engine, config *runconfig.Config, f Fataler, name string) (shortId string) {