Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/dhcpcd/dist sync



details:   https://anonhg.NetBSD.org/src/rev/d92e54fce082
branches:  trunk
changeset: 761661:d92e54fce082
user:      roy <roy%NetBSD.org@localhost>
date:      Fri Feb 04 15:03:14 2011 +0000

description:
sync

diffstat:

 external/bsd/dhcpcd/dist/dhcpcd.8.in |  19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)

diffs (48 lines):

diff -r 2d0b833a9f22 -r d92e54fce082 external/bsd/dhcpcd/dist/dhcpcd.8.in
--- a/external/bsd/dhcpcd/dist/dhcpcd.8.in      Fri Feb 04 15:00:22 2011 +0000
+++ b/external/bsd/dhcpcd/dist/dhcpcd.8.in      Fri Feb 04 15:03:14 2011 +0000
@@ -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.



Home | Main Index | Thread Index | Old Index