Browse code
Merge pull request #8963 from blakery/master
Cleanup: made GetDefaultNetworkMtu private
Michael Crosby authored on 2014/11/07 05:02:18Showing 3 changed files
| ... | ... |
@@ -70,7 +70,7 @@ func (config *Config) InstallFlags() {
|
| 70 | 70 |
opts.MirrorListVar(&config.Mirrors, []string{"-registry-mirror"}, "Specify a preferred Docker registry mirror")
|
| 71 | 71 |
} |
| 72 | 72 |
|
| 73 |
-func GetDefaultNetworkMtu() int {
|
|
| 73 |
+func getDefaultNetworkMtu() int {
|
|
| 74 | 74 |
if iface, err := networkdriver.GetDefaultRouteIface(); err == nil {
|
| 75 | 75 |
return iface.MTU |
| 76 | 76 |
} |
| ... | ... |
@@ -721,8 +721,7 @@ func NewDaemon(config *Config, eng *engine.Engine) (*Daemon, error) {
|
| 721 | 721 |
func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error) {
|
| 722 | 722 |
// Apply configuration defaults |
| 723 | 723 |
if config.Mtu == 0 {
|
| 724 |
- // FIXME: GetDefaultNetwork Mtu doesn't need to be public anymore |
|
| 725 |
- config.Mtu = GetDefaultNetworkMtu() |
|
| 724 |
+ config.Mtu = getDefaultNetworkMtu() |
|
| 726 | 725 |
} |
| 727 | 726 |
// Check for mutually incompatible config options |
| 728 | 727 |
if config.BridgeIface != "" && config.BridgeIP != "" {
|
| ... | ... |
@@ -37,10 +37,6 @@ type Fataler interface {
|
| 37 | 37 |
func mkDaemon(f Fataler) *daemon.Daemon {
|
| 38 | 38 |
eng := newTestEngine(f, false, "") |
| 39 | 39 |
return mkDaemonFromEngine(eng, f) |
| 40 |
- // FIXME: |
|
| 41 |
- // [...] |
|
| 42 |
- // Mtu: docker.GetDefaultNetworkMtu(), |
|
| 43 |
- // [...] |
|
| 44 | 40 |
} |
| 45 | 41 |
|
| 46 | 42 |
func createNamedTestContainer(eng *engine.Engine, config *runconfig.Config, f Fataler, name string) (shortId string) {
|