diff options
| -rw-r--r-- | etc/rc | 13 | ||||
| -rw-r--r-- | share/man/man5/Makefile | 13 | ||||
| -rw-r--r-- | share/man/man5/mixerctl.conf.5 | 48 | ||||
| -rw-r--r-- | usr.bin/mixerctl/mixerctl.1 | 3 |
4 files changed, 69 insertions, 8 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.259 2004/11/03 18:04:46 henning Exp $ +# $OpenBSD: rc,v 1.260 2004/11/22 09:26:23 jsg Exp $ # System startup script run by init on autoboot # or after single-user. @@ -171,6 +171,17 @@ if [ -f /etc/sysctl.conf ]; then ) fi +if [ -f /etc/mixerctl.conf ]; then +( + # delete comments and blank lines + set -- `stripcom /etc/mixerctl.conf` + while [ $# -ge 1 ] ; do + mixerctl -q $1 > /dev/null 2>&1 + shift + done +) +fi + # set hostname, turn on network echo 'starting network' . /etc/netstart diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index fb8fbe74569..0eb4f4ffda8 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.37 2004/07/23 17:27:39 jaredy Exp $ +# $OpenBSD: Makefile,v 1.38 2004/11/22 09:26:23 jsg Exp $ # $NetBSD: Makefile,v 1.14 1995/05/11 23:13:15 cgd Exp $ # missing: dump.5 plot.5 @@ -6,11 +6,12 @@ MAN= a.out.5 acct.5 bsd.port.mk.5 bsd.regress.mk.5 changelist.5 core.5 \ defaultdomain.5 dir.5 disktab.5 elf.5 ethers.5 fbtab.5 files.conf.5 \ forward.5 fs.5 fstab.5 genassym.cf.5 group.5 hostname.if.5 \ - hosts.equiv.5 hosts.5 intro.5 link.5 login.conf.5 mk.conf.5 moduli.5 \ - motd.5 myname.5 netgroup.5 networks.5 passwd.5 pf.conf.5 pf.os.5 \ - phones.5 printcap.5 protocols.5 remote.5 resolv.conf.5 rpc.5 \ - services.5 shells.5 stab.5 spamd.conf.5 sysctl.conf.5 types.5 utmp.5 \ - wsconsctl.conf.5 + hosts.equiv.5 hosts.5 intro.5 link.5 login.conf.5 mixerctl.conf.5 \ + mk.conf.5 moduli.5 motd.5 myname.5 netgroup.5 networks.5 passwd.5 \ + pf.conf.5 pf.os.5 phones.5 printcap.5 protocols.5 remote.5 \ + resolv.conf.5 rpc.5 services.5 shells.5 stab.5 spamd.conf.5 \ + sysctl.conf.5 types.5 utmp.5 wsconsctl.conf.5 + MLINKS= dir.5 dirent.5 fs.5 inode.5 utmp.5 wtmp.5 utmp.5 lastlog.5 MLINKS+= hosts.equiv.5 .rhosts.5 MLINKS+= resolv.conf.5 resolver.5 diff --git a/share/man/man5/mixerctl.conf.5 b/share/man/man5/mixerctl.conf.5 new file mode 100644 index 00000000000..7b4a317001d --- /dev/null +++ b/share/man/man5/mixerctl.conf.5 @@ -0,0 +1,48 @@ +.\" $OpenBSD: mixerctl.conf.5,v 1.1 2004/11/22 09:26:24 jsg Exp $ +.\" +.\" Copyright (c) 2004 Jonathan Gray <jsg@openbsd.org> +.\" +.\" Permission to use, copy, modify, and distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.Dd November 20, 2004 +.Dt MIXERCTL.CONF 5 +.Os +.Sh NAME +.Nm mixerctl.conf +.Nd mixerctl variables to set at system startup +.Sh DESCRIPTION +.Nm +contains a list of +.Xr mixerctl 1 +variable assignments that is read at system startup by +.Xr rc 8 +early on in the boot sequence. +.Pp +The file is made up of +.Xr mixerctl 1 +variable assignments +.Pq Ar variable Ns = Ns Ar value +with comments designated by a hash mark +.Pq Sq # . +.Sh FILES +.Bl -tag -width /etc/mixerctl.conf -compact +.It Pa /etc/mixerctl.conf +.El +.Sh EXAMPLES +To turn on the line in input, use the following line: +.Bd -literal -offset indent +inputs.line.mute=off +.Ed +.Sh SEE ALSO +.Xr mixerctl 1 , +.Xr rc 8 diff --git a/usr.bin/mixerctl/mixerctl.1 b/usr.bin/mixerctl/mixerctl.1 index 82deda04981..335879e67b7 100644 --- a/usr.bin/mixerctl/mixerctl.1 +++ b/usr.bin/mixerctl/mixerctl.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mixerctl.1,v 1.21 2004/07/30 12:02:40 jmc Exp $ +.\" $OpenBSD: mixerctl.1,v 1.22 2004/11/22 09:26:24 jsg Exp $ .\" $NetBSD: mixerctl.1,v 1.8 1998/05/09 12:41:16 augustss Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -158,6 +158,7 @@ monitor.monitor=0 volume .Xr audioctl 1 , .Xr cdio 1 , .Xr audio 4 , +.Xr mixerctl.conf 5 , .Xr sysctl 8 .Sh HISTORY The |