summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2012-02-08 08:52:40 +0000
committerdougb <dougb@FreeBSD.org>2012-02-08 08:52:40 +0000
commitdd6bba093e5163f05fcfb84865b091c7f63dae7e (patch)
tree4cc1364e0b264e1528debb864eff5cdde8390d44 /etc
parent62f39c08bc71631953399bbc9285503a4f0060d1 (diff)
downloadFreeBSD-src-dd6bba093e5163f05fcfb84865b091c7f63dae7e.zip
FreeBSD-src-dd6bba093e5163f05fcfb84865b091c7f63dae7e.tar.gz
As it stands right now, the default devfs rulesets are only loaded as a
side effect of something else using them. If they haven't been loaded already but you want to use them, say for configuring a jail, you're out of luck. So add a knob to always load the default rulesets. While I'm here document the other devfs_ knobs in rc.conf.5.
Diffstat (limited to 'etc')
-rw-r--r--etc/defaults/rc.conf1
-rwxr-xr-xetc/rc.d/devfs3
2 files changed, 3 insertions, 1 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index b9e78ce..e8273d4 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -648,6 +648,7 @@ devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules" # Files containing
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
diff --git a/etc/rc.d/devfs b/etc/rc.d/devfs
index 82278af..206a3ed 100755
--- a/etc/rc.d/devfs
+++ b/etc/rc.d/devfs
@@ -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
OpenPOWER on IntegriCloud