Module Name: src
Committed By: roy
Date: Sun Oct 25 23:35:41 UTC 2009
Modified Files:
src/external/bsd/dhcpcd/dist: dhcpcd.8.in dhcpcd.conf
Log Message:
Sync with import
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcpcd/dist/dhcpcd.8.in
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcpcd/dist/dhcpcd.conf
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.3 src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.4
--- src/external/bsd/dhcpcd/dist/dhcpcd.8.in:1.3 Fri Oct 16 21:57:54 2009
+++ src/external/bsd/dhcpcd/dist/dhcpcd.8.in Sun Oct 25 23:35:41 2009
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd October 16, 2009
+.Dd October 25, 2009
.Dt DHCPCD 8 SMM
.Os
.Sh NAME
@@ -113,16 +113,28 @@
.Fl L , -noipv4ll
option.
.Ss Multiple interfaces
-.Nm
-can be run per interface or as a single instance to manage all interfaces.
If a list of interfaces are given on the command line, then
.Nm
only works with those interfaces, otherwise
.Nm
-discovers available interfaces.
-If link management is enabled and no interfaces are given on the command line,
+discovers available Ethernet interfaces.
+If any interface reports a working carrier then
+.Nm
+will try and obtain a lease before forking to the background,
+otherwise it will fork right away.
+This behaviour can be modified with the
+.Fl b , -background
+and
+.Fl w , -waitip
+options.
+.Pp
+If a single interface is given then
.Nm
-forks to the background right away.
+only works for that interface and runs as a separate instance.
+The
+.Fl w , -waitip
+option is enabled in this instance to maintain compatability with older
+versions.
.Pp
Interfaces are preferred by carrier, DHCP lease/IPv4LL and then lowest metric.
For systems that support route metrics, each route will be tagged with the
@@ -536,6 +548,10 @@
.It Pa @DBDIR@/dhcpcd\- Ns Ar interface Ns .lease
The actual DHCP message send by the server. We use this when reading the last
lease and use the files mtime as when it was issued.
+.It Pa /var/run/dhcpcd.pid
+Stores the PID of
+.Nm
+running on all interfaces.
.It Pa /var/run/dhcpcd\- Ns Ar interface Ns .pid
Stores the PID of
.Nm
Index: src/external/bsd/dhcpcd/dist/dhcpcd.conf
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.conf:1.4 src/external/bsd/dhcpcd/dist/dhcpcd.conf:1.5
--- src/external/bsd/dhcpcd/dist/dhcpcd.conf:1.4 Fri Oct 2 21:36:41 2009
+++ src/external/bsd/dhcpcd/dist/dhcpcd.conf Sun Oct 25 23:35:41 2009
@@ -1,4 +1,4 @@
-# $NetBSD: dhcpcd.conf,v 1.4 2009/10/02 21:36:41 roy Exp $
+# $NetBSD: dhcpcd.conf,v 1.5 2009/10/25 23:35:41 roy Exp $
#
# A sample configuration for dhcpcd.
# See dhcpcd.conf(5) for details.
@@ -12,6 +12,7 @@
# A list of options to request from the DHCP server.
option domain_name_servers, domain_name, domain_search, host_name
+option classless_static_routes
# Most distributions have NTP support.
option ntp_servers
# Respect the network MTU.
