0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13111 from gianlucaborello/fix-mac-documentation

Browse source 
Correctly document MAC address generation
This commit is contained in:
Sebastiaan van Stijn 2015-05-10 13:43:27 -04:00
commit 4d6720bfbb
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
}
// 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 {
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
you can override this with `--dns`.
By default a random MAC is generated. You can set the container's MAC address
explicitly by providing a MAC via the `--mac-address` parameter (format:
`12:34:56:78:9a:bc`).
By default, the MAC address is generated using the IP address allocated to the
container. You can set the container's MAC address explicitly by providing a
MAC address via the `--mac-address` parameter (format:`12:34:56:78:9a:bc`).
Supported networking modes are: