summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflz <flz@FreeBSD.org>2006-10-06 23:22:13 +0000
committerflz <flz@FreeBSD.org>2006-10-06 23:22:13 +0000
commit8587b166ef726247076231f7199b6ac0e1925c4f (patch)
tree4ffa55f1c5fb61cd65de17cbbfc0eda376789a89
parent1101c26eb3e7f05d42988d4b04fb6474cbce9ac3 (diff)
downloadFreeBSD-src-8587b166ef726247076231f7199b6ac0e1925c4f.zip
FreeBSD-src-8587b166ef726247076231f7199b6ac0e1925c4f.tar.gz
Introduce mixer_enable (default: YES).
PR: conf/101268 Submitted by: Eugene Grosbein <eugen@grosbein.pp.ru> Approved by: cperciva (mentor) X-MFC after: 6.2-RELEASE Sponsored by: FreeBSD Test-Bugathon
-rw-r--r--etc/defaults/rc.conf1
-rw-r--r--etc/rc.d/mixer1
-rw-r--r--share/man/man5/rc.conf.58
3 files changed, 9 insertions, 1 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 3b2589f..4756e6b 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -535,6 +535,7 @@ bsdextended_script="/etc/rc.bsdextended" # Default mac_bsdextended(4)
# ruleset file.
newsyslog_enable="YES" # Run newsyslog at startup.
newsyslog_flags="-CN" # Newsyslog flags to create marked files
+mixer_enable="YES" # Run the sound mixer.
##############################################################
### Jail Configuration #######################################
diff --git a/etc/rc.d/mixer b/etc/rc.d/mixer
index db4f0db..cc7fb2d 100644
--- a/etc/rc.d/mixer
+++ b/etc/rc.d/mixer
@@ -34,6 +34,7 @@
. /etc/rc.subr
name="mixer"
+rcvar="mixer_enable"
stop_cmd="mixer_stop"
start_cmd="mixer_start"
reload_cmd="mixer_start"
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index eea9180..10a7e53 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd September 29, 2006
+.Dd October 6, 2006
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -3612,6 +3612,11 @@ For example:
autobridge_interfaces="bridge0"
autobridge_bridge0="tap* dc0 vlan[345]"
.Ed
+.It mixer_enable
+.Pq Vt bool
+If set to
+.Dq Li YES ,
+enable support for sound mixer.
.El
.Sh FILES
.Bl -tag -width ".Pa /etc/defaults/rc.conf" -compact
@@ -3668,6 +3673,7 @@ autobridge_bridge0="tap* dc0 vlan[345]"
.Xr lpd 8 ,
.Xr mdconfig 8 ,
.Xr mdmfs 8 ,
+.Xr mixer 8,
.Xr mountd 8 ,
.Xr moused 8 ,
.Xr mrouted 8 ,
OpenPOWER on IntegriCloud