Module Name: src
Committed By: roy
Date: Fri Feb 4 15:03:14 UTC 2011
Modified Files:
src/external/bsd/dhcpcd/dist: dhcpcd.8.in
Log Message:
sync
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcpcd/dist/dhcpcd.8.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/dhcpcd.8.in
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.7 src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.8
--- src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.7 Sat Nov 27 11:28:24 2010
+++ src/external/bsd/dhcpcd/dist/dhcpcd.8.in Fri Feb 4 15:03:14 2011
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006-2010 Roy Marples
+.\" Copyright (c) 2006-2011 Roy Marples
.\" All rights reserved
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd August 31, 2010
+.Dd January 3, 2011
.Dt DHCPCD 8 SMM
.Os
.Sh NAME
@@ -274,17 +274,10 @@
NFS.
You can use this option to stop this from happening.
.It Fl r , -request Op Ar address
-.Nm
-normally sends a DHCP DISCOVER to find servers to offer an address.
-.Nm
-then requests the address used.
-You can use this option to skip the DISCOVER phase and just request the
-.Ar address .
-The downside is if you request an
+Request the
.Ar address
-the DHCP server does not know about or the DHCP server is not
-authoritative, it will remain silent.
-In this situation, we go back to the init state and DISCOVER again.
+in the DHCP DISCOVER message.
+There is no guarantee this is the address the DHCP server will actual give.
If no
.Ar address
is given then the first address currently assigned to the
@@ -293,7 +286,7 @@
.It Fl s , -inform Op Ar address Ns Op Ar /cidr
Behaves like
.Fl r , -request
-as above, but sends a DHCP INFORM instead of a REQUEST.
+as above, but sends a DHCP INFORM instead of DISCOVER/REQUEST.
This does not get a lease as such, just notifies the DHCP server of the
.Ar address
in use.
