Module Name: src
Committed By: roy
Date: Tue Oct 2 17:43:53 UTC 2012
Modified Files:
src/distrib/notes/common: postinstall
src/share/man/man8: afterboot.8
Log Message:
Prefer dhcpcd(8) over dhclient(8).
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/distrib/notes/common/postinstall
cvs rdiff -u -r1.49 -r1.50 src/share/man/man8/afterboot.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/postinstall
diff -u src/distrib/notes/common/postinstall:1.76 src/distrib/notes/common/postinstall:1.77
--- src/distrib/notes/common/postinstall:1.76 Fri Aug 17 19:55:14 2012
+++ src/distrib/notes/common/postinstall Tue Oct 2 17:43:52 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: postinstall,v 1.76 2012/08/17 19:55:14 riz Exp $
+.\" $NetBSD: postinstall,v 1.77 2012/10/02 17:43:52 roy Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -199,7 +199,7 @@ or
for more information.
Instead of manually configuring network and naming service,
DHCP can be used by setting
-.Li dhclient=YES
+.Li dhcpcd=YES
in
.Pa /etc/rc.conf .
.Pp
Index: src/share/man/man8/afterboot.8
diff -u src/share/man/man8/afterboot.8:1.49 src/share/man/man8/afterboot.8:1.50
--- src/share/man/man8/afterboot.8:1.49 Sun Sep 30 20:49:12 2012
+++ src/share/man/man8/afterboot.8 Tue Oct 2 17:43:53 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: afterboot.8,v 1.49 2012/09/30 20:49:12 riastradh Exp $
+.\" $NetBSD: afterboot.8,v 1.50 2012/10/02 17:43:53 roy Exp $
.\" $OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $
.\"
.\" Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu
@@ -59,7 +59,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd June 26, 2010
+.Dd October 2, 2012
.Dt AFTERBOOT 8
.Os
.Sh NAME
@@ -214,7 +214,7 @@ is supposed include a domainname, and th
not be confused with YP (NIS)
.Xr domainname 1 .
If you are using
-.Xr dhclient 8
+.Xr dhcpcd 8
to configure network interfaces, it might override these local hostname
settings if your DHCP server specifies client's hostname with other network
configurations.
@@ -238,20 +238,20 @@ to manually configure it
if you do not wish to reboot.
.Pp
Alternatively, you can configure interfaces automatically via DHCP with
-.Xr dhclient 8
+.Xr dhcpcd 8
if you have a DHCP server running somewhere on your network.
To get
-.Xr dhclient 8
+.Xr dhcpcd 8
to start automatically on boot,
you will need to have this line in
.Pa /etc/rc.conf :
.Pp
-.Dl dhclient=YES
+.Dl dhcpcd=YES
.Pp
See
-.Xr dhclient 8
+.Xr dhcpcd 8
and
-.Xr dhclient.conf 5
+.Xr dhcpcd.conf 5
for more information on setting up a DHCP client.
.Pp
You can add new
@@ -341,9 +341,14 @@ If you run
you will have to kill it by running
.Bd -literal -offset indent
.Ic /etc/rc.d/dhclient stop
+If you run
+.Xr dhcpcd 8
+you will have to kill it by running
+.Bd -literal -offset indent
+.Ic /etc/rc.d/dhcpcd stop
.Pp
.Ed
-after you flush the routes.
+before you flush the routes.
.Pp
If you wish to route packets between interfaces, add one or both
of the following directives (depending on whether IPv4 or IPv6 routing
@@ -977,6 +982,7 @@ for details on how to do so.
.Xr aliases 5 ,
.Xr crontab 5 ,
.Xr dhclient.conf 5 ,
+.Xr dhcpcd.conf 5 ,
.Xr exports 5 ,
.Xr fstab 5 ,
.Xr group 5 ,
@@ -999,6 +1005,7 @@ for details on how to do so.
.Xr ccdconfig 8 ,
.Xr chown 8 ,
.Xr dhclient 8 ,
+.Xr dhcpcd 8 ,
.Xr dhcpd 8 ,
.Xr dmesg 8 ,
.Xr groupadd 8 ,
