[src/netbsd-6]: src/share/man/man5 Pull up following revision(s) (requested b...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d2432dd72a57
branches:  netbsd-6
changeset: 774638:d2432dd72a57
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Oct 09 23:03:47 2012 +0000

description:
Pull up following revision(s) (requested by roy in ticket #588):
        share/man/man5/ifconfig.if.5: revision 1.16
        share/man/man5/rc.conf.5: revision 1.154
Discourage the use of ifconfig_bge0=dhcp and prefer setting dhcpcd=YES
in rc.conf(5) instead.

diffstat:

 share/man/man5/ifconfig.if.5 |   8 +++++++-
 share/man/man5/rc.conf.5     |  36 ++++++++++++++++++++++++------------
 2 files changed, 31 insertions(+), 13 deletions(-)

diffs (81 lines):

diff -r 4006b2bdf10f -r d2432dd72a57 share/man/man5/ifconfig.if.5
--- a/share/man/man5/ifconfig.if.5      Tue Oct 09 22:58:35 2012 +0000
+++ b/share/man/man5/ifconfig.if.5      Tue Oct 09 23:03:47 2012 +0000
@@ -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.15.6.1 2012/10/09 23:03:47 riz Exp $
 .\"
 .\" Copyright (c) 1996 Matthew R. Green
 .\" All rights reserved.
@@ -87,6 +87,12 @@
 .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 # ,
diff -r 4006b2bdf10f -r d2432dd72a57 share/man/man5/rc.conf.5
--- a/share/man/man5/rc.conf.5  Tue Oct 09 22:58:35 2012 +0000
+++ b/share/man/man5/rc.conf.5  Tue Oct 09 23:03:47 2012 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: rc.conf.5,v 1.151.2.1 2012/06/23 22:54:59 riz Exp $
+.\"    $NetBSD: rc.conf.5,v 1.151.2.2 2012/10/09 23:03:47 riz Exp $
 .\"
 .\" Copyright (c) 1996 Matthew R. Green
 .\" All rights reserved.
@@ -642,13 +642,30 @@
 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
-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.
@@ -816,12 +833,7 @@
 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