Date: Sun, 28 Feb 2010 11:22:42 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r204445 - in stable/7: sbin/devfs share/man/man5 Message-ID: <201002281122.o1SBMg4F062895@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gavin Date: Sun Feb 28 11:22:42 2010 New Revision: 204445 URL: http://svn.freebsd.org/changeset/base/204445 Log: 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) Modified: stable/7/sbin/devfs/devfs.8 stable/7/share/man/man5/devfs.rules.5 Directory Properties: stable/7/sbin/devfs/ (props changed) stable/7/share/man/man5/ (props changed) stable/7/share/man/man5/rc.conf.5 (props changed) Modified: stable/7/sbin/devfs/devfs.8 ============================================================================== --- stable/7/sbin/devfs/devfs.8 Sun Feb 28 11:14:29 2010 (r204444) +++ stable/7/sbin/devfs/devfs.8 Sun Feb 28 11:22:42 2010 (r204445) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 1, 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 Modified: stable/7/share/man/man5/devfs.rules.5 ============================================================================== --- stable/7/share/man/man5/devfs.rules.5 Sun Feb 28 11:14:29 2010 (r204444) +++ stable/7/share/man/man5/devfs.rules.5 Sun Feb 28 11:22:42 2010 (r204445) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002281122.o1SBMg4F062895>