aboutsummaryrefslogtreecommitdiffstats
path: root/dhcpcd.conf.5.in
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2012-07-23 16:45:46 -0700
committerDmitry Shmidt <dimitrysh@google.com>2012-07-23 16:54:15 -0700
commita3a2260384a906e1674c7498c2f479e9f37bc503 (patch)
tree5e5adc874a930144f847f57a08da862413b63668 /dhcpcd.conf.5.in
parent2af699ea51cca49bd0f19080c9d73170e5bdadbc (diff)
downloadandroid_external_dhcpcd-a3a2260384a906e1674c7498c2f479e9f37bc503.tar.gz
android_external_dhcpcd-a3a2260384a906e1674c7498c2f479e9f37bc503.tar.bz2
android_external_dhcpcd-a3a2260384a906e1674c7498c2f479e9f37bc503.zip
dhcpcd: Update to Version 5.5.6
Change-Id: I98c378688be723a2a602ec17c26bc13f2fd83cc8 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'dhcpcd.conf.5.in')
-rw-r--r--dhcpcd.conf.5.in21
1 files changed, 17 insertions, 4 deletions
diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in
index c3bfa8f..9f0ef27 100644
--- a/dhcpcd.conf.5.in
+++ b/dhcpcd.conf.5.in
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006-2010 Roy Marples
+.\" Copyright (c) 2006-2012 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 January 28, 2010
+.Dd March 19, 2012
.Dt DHCPCD.CONF 5 SMM
.Os
.Sh NAME
@@ -144,6 +144,16 @@ encodes the FQDN hostname as specified in
.It Ic interface Ar interface
Subsequent options are only parsed for this
.Ar interface .
+.It Ic ipv6ra_fork
+By default, when
+.Nm dhcpcd
+receives an IPv6 RA,
+.Nm dhcpcd
+will only fork to the background if the RA contains at least one unexpired
+RDNSS option.
+Set this option so to make
+.Nm dhcpcd
+always fork on an RA.
.It Ic leasetime Ar seconds
Request a leasetime of
.Ar seconds .
@@ -173,6 +183,8 @@ See
.Rs
.%T "RFC 3927"
.Re
+.It Ic noipv6rs
+Disable solicition of IPv6 Router Advertisements.
.It Ic nolink
Don't receive link messages about carrier status.
You should only set this for buggy interface drivers.
@@ -203,7 +215,7 @@ Suppress any dhcpcd output to the console, except for errors.
Allow
.Ar reboot
seconds before moving to the discover phase if we have an old lease to use.
-The default is 10 seconds.
+The default is 5 seconds.
A setting if 0 seconds causes
.Nm dhcpcd
to skip the reboot phase and go straight into discover.
@@ -293,4 +305,5 @@ of a randomly generated number.
.Sh AUTHORS
.An Roy Marples Aq roy@marples.name
.Sh BUGS
-Please report them to http://roy.marples.name/projects/dhcpcd
+Please report them to
+.Lk http://roy.marples.name/projects/dhcpcd