kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Default MAC address generation is not random and should be stated in the documentation. 

Signed-off-by: Gianluca Borello <g.borello@gmail.com>
This commit is contained in:
Gianluca Borello 2015-05-09 22:36:16 -07:00
parent 340fd140e6
commit e324f51e5b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/networkdriver/bridge/driver.go
View File

@ -608,7 +608,7 @@ func Allocate(id, requestedMac, requestedIP, requestedIPv6 string) (*network.Set
return nil, err return nil, err
} }
// If no explicit mac address was given, generate a random one. // If no explicit mac address was given, generate one from the IP address.
if mac, err = net.ParseMAC(requestedMac); err != nil { if mac, err = net.ParseMAC(requestedMac); err != nil {
mac = generateMacAddr(ip) mac = generateMacAddr(ip)
} }

6
docs/sources/reference/run.md
View File

@ -216,9 +216,9 @@ networking. In cases like this, you would perform I/O through files or
Your container will use the same DNS servers as the host by default, but Your container will use the same DNS servers as the host by default, but
you can override this with `--dns`. you can override this with `--dns`.
By default a random MAC is generated. You can set the container's MAC address By default, the MAC address is generated using the IP address allocated to the
explicitly by providing a MAC via the `--mac-address` parameter (format: container. You can set the container's MAC address explicitly by providing a
`12:34:56:78:9a:bc`). MAC address via the `--mac-address` parameter (format:`12:34:56:78:9a:bc`).
Supported networking modes are: Supported networking modes are: