Author: dougb
Date: Tue Feb 14 10:30:12 2012
New Revision: 231662
URL: http://svn.freebsd.org/changeset/base/231662
Log:
MFC r231194:
Add a knob to always load the default rulesets. While I'm here document
the other devfs_ knobs in rc.conf.5.
Modified:
stable/7/etc/defaults/rc.conf
stable/7/etc/rc.d/devfs
stable/7/share/man/man5/rc.conf.5
Directory Properties:
stable/7/etc/ (props changed)
stable/7/share/man/man5/ (props changed)
Modified: stable/7/etc/defaults/rc.conf
==============================================================================
--- stable/7/etc/defaults/rc.conf Tue Feb 14 10:29:48 2012
(r231661)
+++ stable/7/etc/defaults/rc.conf Tue Feb 14 10:30:12 2012
(r231662)
@@ -610,6 +610,7 @@ devfs_rulesets="/etc/defaults/devfs.rule
devfs_system_ruleset="" # The name (NOT number) of a ruleset to apply
to /dev
devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to
# apply (must be mounted already, i.e. fstab(5))
+devfs_load_rulesets="NO" # Enable to always load the default rulesets
performance_cx_lowest="HIGH" # Online CPU idle state
performance_cpu_freq="NONE" # Online CPU frequency
economy_cx_lowest="HIGH" # Offline CPU idle state
Modified: stable/7/etc/rc.d/devfs
==============================================================================
--- stable/7/etc/rc.d/devfs Tue Feb 14 10:29:48 2012 (r231661)
+++ stable/7/etc/rc.d/devfs Tue Feb 14 10:30:12 2012 (r231662)
@@ -16,7 +16,8 @@ stop_cmd=':'
devfs_start()
{
- if [ -n "$devfs_system_ruleset" -o -n "$devfs_set_rulesets" ]; then
+ if [ -n "$devfs_system_ruleset" -o -n "$devfs_set_rulesets" ] ||
+ checkyesno devfs_load_rulesets; then
devfs_init_rulesets
if [ -n "$devfs_system_ruleset" ]; then
devfs_set_ruleset $devfs_system_ruleset /dev
Modified: stable/7/share/man/man5/rc.conf.5
==============================================================================
--- stable/7/share/man/man5/rc.conf.5 Tue Feb 14 10:29:48 2012
(r231661)
+++ stable/7/share/man/man5/rc.conf.5 Tue Feb 14 10:30:12 2012
(r231662)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 19, 2011
+.Dd February 8, 2012
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -3338,6 +3338,25 @@ is set to
these are the flags passed to the
.Xr watchdogd 8
daemon.
+.It Va devfs_rulesets
+.Pq Vt str
+List of files containing sets of rules for
+.Xr devfs 8 .
+.It Va devfs_system_ruleset
+.Pq Vt str
+Rule name(s) to apply to the system
+.Pa /dev
+itself.
+.It Va devfs_set_rulesets
+.Pq Vt str
+Pairs of already-mounted
+.Pa dev
+directories and rulesets that should be applied to them.
+For example: /mount/dev=ruleset_name
+.It Va devfs_load_rulesets
+.Pq Vt bool
+If set, always load the default rulesets listed in
+.Va devfs_rulesets .
.It Va performance_cx_lowest
.Pq Vt str
CPU idle state to use while on AC power.
@@ -4240,6 +4259,7 @@ The default is 30.
.Xr chkprintcap 8 ,
.Xr chown 8 ,
.Xr cron 8 ,
+.Xr devfs 8 ,
.Xr dhclient 8 ,
.Xr ftpd 8 ,
.Xr geli 8 ,
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
