Browse code

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

Signed-off-by: Gianluca Borello <g.borello@gmail.com>

Gianluca Borello authored on 2015/05/10 14:36:16
Showing 2 changed files
... ...
@@ -608,7 +608,7 @@ func Allocate(id, requestedMac, requestedIP, requestedIPv6 string) (*network.Set
608 608
 		return nil, err
609 609
 	}
610 610
 
611
-	// If no explicit mac address was given, generate a random one.
611
+	// If no explicit mac address was given, generate one from the IP address.
612 612
 	if mac, err = net.ParseMAC(requestedMac); err != nil {
613 613
 		mac = generateMacAddr(ip)
614 614
 	}
... ...
@@ -216,9 +216,9 @@ networking. In cases like this, you would perform I/O through files or
216 216
 Your container will use the same DNS servers as the host by default, but
217 217
 you can override this with `--dns`.
218 218
 
219
-By default a random MAC is generated. You can set the container's MAC address
220
-explicitly by providing a MAC via the `--mac-address` parameter (format:
221
-`12:34:56:78:9a:bc`).
219
+By default, the MAC address is generated using the IP address allocated to the
220
+container. You can set the container's MAC address explicitly by providing a
221
+MAC address via the `--mac-address` parameter (format:`12:34:56:78:9a:bc`).
222 222
 
223 223
 Supported networking modes are:
224 224