dhcpcd: Upgrade from 4.0.1 to 4.0.15

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

1 files changed, 21 insertions, 4 deletions

diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in
index 899aea3..9e0a023 100644
--- a/dhcpcd.conf.5.in
+++ b/dhcpcd.conf.5.in
@@ -22,8 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd August 18, 2008
+.Dd November 18, 2008
 .Dt DHCPCD.CONF 5 SMM
+.Os
 .Sh NAME
 .Nm dhcpcd.conf
 .Nd dhcpcd configuration file 
@@ -47,10 +48,24 @@ Here's a list of available options:
 Background immediately.
 This is useful for startup scripts which don't disable link messages for
 carrier status.
+.It Ic blacklist Ar address
+Ignores all DHCP messages which have this
+.Ar address
+as the server ID.
+This may be expanded in future releases to ignore all packets
+matching either the IP or hardware
+.Ar address .
 .It Ic clientid Ar string
-Change the default clientid sent from the interface hardware address.
+Send the
+.Ar clientid .
 If the string is of the format 01:02:03 then it is encoded as hex.
-If not set then none is sent.
+For interfaces whose hardware address is longer than 8 bytes, or if the
+.Ar clientid
+is an empty string then
+.Nm dhcpcd
+sends a default
+.Ar clientid
+of the hardware family and the hardware address.
 .It Ic duid
 Generate an
 .Rs
@@ -111,6 +126,8 @@ It can be a variable to be used in
 .Xr dhcpcd-run-hooks 8
 or the numerical value.
 You can specify more options seperated by commas, spaces or more option lines.
+.Ic quiet
+Supress any dhcpcd output to the console, except for errors.
 .It Ic require Ar option
 Requires the
 .Ar option
@@ -152,4 +169,4 @@ If not set then none is sent.
 .Sh AUTHORS
 .An Roy Marples <roy@marples.name>
 .Sh BUGS
-Please report them to http://bugs.marples.name
+Please report them to http://roy.marples.name/projects/dhcpcd