Merge r204166 from head:

Document the interaction between /etc/devfs.conf and
  /etc/defaults/devfs.conf

PR:		docs/117308
Submitted by:	Mel <mel.xyzzy rachie.is-a-geek.net> (partially)
This commit is contained in:
Gavin Atkinson 2010-02-28 11:14:29 +00:00
parent c5fc7d9644
commit d180e5eb6c
2 changed files with 17 additions and 4 deletions

View file

@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd June 27, 2008
.Dd February 21, 2010
.Dt DEVFS 8
.Os
.Sh NAME
@ -196,6 +196,9 @@ Apply all the rules in ruleset number
to the node.
This does not necessarily result in any changes to the node
(e.g., if none of the rules in the included ruleset match).
Include commands in the referenced
.Ar ruleset
are not resolved.
.It Cm mode Ar filemode
Set the file mode to
.Ar filemode ,
@ -243,7 +246,9 @@ configuration file.
.It Pa /etc/devfs.rules
Local
.Nm
configuration file.
configuration file. Rulesets in here override those in
.Pa /etc/defaults/devfs.rules
with the same ruleset number, otherwise the two files are effectively merged.
.It Pa /etc/devfs.conf
Boot-time
.Nm

View file

@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd January 30, 2006
.Dd February 21, 2010
.Dt DEVFS.RULES 5
.Os
.Sh NAME
@ -83,8 +83,16 @@ devfs_system_ruleset="localrules"
.Ed
.Sh FILES
.Bl -tag -compact
.It Pa /etc/devfs.rules
.It Pa /etc/defaults/devfs.rules
Default
.Nm
configuration file.
.It Pa /etc/devfs.rules
Local
.Nm
configuration file. Rulesets in here override those in
.Pa /etc/defaults/devfs.rules
with the same ruleset number, otherwise the two files are effectively merged.
.El
.Sh EXAMPLES
To make all the partitions of