Module Name: src
Committed By: roy
Date: Tue Oct 2 09:18:59 UTC 2012
Modified Files:
src/share/man/man5: ifconfig.if.5 rc.conf.5
Log Message:
Discourage the use of ifconfig_bge0=dhcp and prefer setting dhcpcd=YES
in rc.conf(5) instead.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/share/man/man5/ifconfig.if.5
cvs rdiff -u -r1.153 -r1.154 src/share/man/man5/rc.conf.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man5/ifconfig.if.5
diff -u src/share/man/man5/ifconfig.if.5:1.15 src/share/man/man5/ifconfig.if.5:1.16
--- src/share/man/man5/ifconfig.if.5:1.15 Thu Apr 7 00:22:59 2011
+++ src/share/man/man5/ifconfig.if.5 Tue Oct 2 09:18:59 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: ifconfig.if.5,v 1.15 2011/04/07 00:22:59 jym Exp $
+.\" $NetBSD: ifconfig.if.5,v 1.16 2012/10/02 09:18:59 roy Exp $
.\"
.\" Copyright (c) 1996 Matthew R. Green
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd April 7, 2011
+.Dd October 2, 2012
.Dt IFCONFIG.IF 5
.Os
.Sh NAME
@@ -87,6 +87,12 @@ If the line is equal to
.Dq dhcp ,
.Xr dhcpcd 8
will be started for the interface.
+However, it is instead recommended that
+.Sy dhcpcd
+is set to true in
+.Xr rc.conf 5
+and any per interface configuration or restriction is done in
+.Xr dhcpcd.conf 5 .
.Pp
If a line is empty, or starts with
.Sq # ,
Index: src/share/man/man5/rc.conf.5
diff -u src/share/man/man5/rc.conf.5:1.153 src/share/man/man5/rc.conf.5:1.154
--- src/share/man/man5/rc.conf.5:1.153 Wed Jul 4 20:53:30 2012
+++ src/share/man/man5/rc.conf.5 Tue Oct 2 09:18:59 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: rc.conf.5,v 1.153 2012/07/04 20:53:30 jdf Exp $
+.\" $NetBSD: rc.conf.5,v 1.154 2012/10/02 09:18:59 roy Exp $
.\"
.\" Copyright (c) 1996 Matthew R. Green
.\" All rights reserved.
@@ -55,7 +55,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd July 4, 2012
+.Dd October 2, 2012
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -652,14 +652,30 @@ then you should specify an alternate loc
file in the
.Sy dhclient_flags
variable - for example, "-lf /tmp/dhclient.leases".
+.It Sy dhcpcd
+Boolean value.
+Set true to configure some or all network interfaces using dhcpcd.
+If you set
+.Sy dhcpcd
+true, then
+.Pa /var
+must be in
+.Sy critical_filesystems_local ,
+or
+.Pa /var
+must be on the root file system.
+If you need to restrict dhcpcd to one or a number of interfaces,
+or need a separate configuration per interface,
+then this should be done in the configuration file - see
+.Xr dhcpcd.conf 5
+for details.
.It Sy dhcpcd_flags
-A string.
-Additional arguments to pass to
+Passes
+.Sy dhcpcd_flags
+to dhcpcd.
+See
.Xr dhcpcd 8
-when requesting configuration via
-.Sy ifconfig_xxN
-or
-.Pa /etc/ifconfig.xxN .
+for complete documentation.
.It Sy flushroutes
Boolean value.
Flushes the route table on networking startup.
@@ -827,12 +843,7 @@ variable contains a single line with emb
then the value is split into multiple lines prior to further parsing,
treating the semicolon as a line separator.
.Pp
-One common case is to set
-.Sy ifconfig_xxN Ns Li \&= Ns Qq dhcp ,
-which will cause
-.Xr dhcpcd 8
-to be started for the interface.
-Another common case it to set the
+One common case it to set the
.Sy ifconfig_xxN
variable to a set of arguments to be passed to an
.Xr ifconfig 8
