mixerctl.conf wsconsctl.conf can properly become examples.

As discussed a few days ago with aja

diff --git a/etc/Makefile b/etc/Makefile
index 6b40a40..7bc827b 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.380 2014/07/16 12:50:42 deraadt Exp $
+#      $OpenBSD: Makefile,v 1.381 2014/07/16 13:21:33 deraadt Exp $
 
 TZDIR=         /usr/share/zoneinfo
 LOCALTIME=     Canada/Mountain
@@ -31,19 +31,20 @@ kernels: bootblocks ${ALL_KERNELS}
 BINOWN= root
 BINGRP= wheel
 MUTABLE=changelist csh.cshrc csh.login csh.logout daily dhclient.conf \
-       etc.${MACHINE}/disktab etc.${MACHINE}/login.conf \
-       ftpusers gettytab group hosts ksh.kshrc locate.rc \
-       mailer.conf man.conf mixerctl.conf moduli monthly motd \
-       myname netstart networks newsyslog.conf pf.os protocols \
-       rc rc.conf rpc services shells syslog.conf weekly
-.if ${MACHINE} != "aviion" 
-MUTABLE+=wsconsctl.conf
-.endif
+       etc.${MACHINE}/disktab etc.${MACHINE}/login.conf ftpusers \
+       gettytab group hosts ksh.kshrc locate.rc mailer.conf man.conf \
+       moduli monthly myname netstart networks newsyslog.conf \
+       pf.os protocols rc rc.conf rpc services shells syslog.conf weekly
 
+# -rw-r--r--
 EXAMPLES=chio.conf dhcpd.conf exports ftpchroot hosts.lpd ifstated.conf \
-       inetd.conf mrouted.conf ntpd.conf printcap rbootd.conf remote \
-       sensorsd.conf
+       inetd.conf mixerctl.conf mrouted.conf ntpd.conf printcap \
+       rbootd.conf remote sensorsd.conf
+.if ${MACHINE} != "aviion" 
+EXAMPLES+= wsconsctl.conf
+.endif
 
+# -rw-------
 EXAMPLES_600=bgpd.conf dvmrpd.conf hostapd.conf iked.conf ipsec.conf \
        ldapd.conf ldpd.conf ospf6d.conf ospfd.conf pf.conf rc.local \
        rc.securelevel rc.shutdown relayd.conf ripd.conf \

diff --git a/etc/examples/mixerctl.conf b/etc/examples/mixerctl.conf
new file mode 100644 (file)
index 0000000..0848627
--- /dev/null
+++ b/etc/examples/mixerctl.conf
@@ -0,0 +1,7 @@
+# $OpenBSD: mixerctl.conf,v 1.1 2014/07/16 13:21:33 deraadt Exp $
+#
+# mixerctl(1) configurable parameters. See mixerctl.conf(5) for details.
+#
+
+# output volume value for most audio cards
+#outputs.master=200

diff --git a/etc/examples/wsconsctl.conf b/etc/examples/wsconsctl.conf
new file mode 100644 (file)
index 0000000..d5fe752
--- /dev/null
+++ b/etc/examples/wsconsctl.conf
@@ -0,0 +1,11 @@
+#      $OpenBSD: wsconsctl.conf,v 1.1 2014/07/16 13:21:33 deraadt Exp $
+#
+# wscons configurable parameters
+#
+#keyboard.repeat.del1=200      # change keyboard repeat/delay
+#keyboard.repeat.deln=50
+#keyboard.encoding=ru          # use different keyboard encoding
+#keyboard.bell.volume=0                # mute keyboard beep
+#display.vblank=on             # enable vertical sync blank for screen burner
+#display.screen_off=60000      # set screen burner timeout to 60 seconds
+#display.msact=off             # disable screen unburn w/ mouse

diff --git a/etc/mixerctl.conf b/etc/mixerctl.conf
deleted file mode 100644 (file)
index 23d8670..0000000
--- a/etc/mixerctl.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# $OpenBSD: mixerctl.conf,v 1.1 2011/10/29 14:29:33 ajacoutot Exp $
-#
-# mixerctl(1) configurable parameters. See mixerctl.conf(5) for details.
-#
-
-# output volume value for most audio cards
-#outputs.master=200

diff --git a/etc/wsconsctl.conf b/etc/wsconsctl.conf
deleted file mode 100644 (file)
index 734089b..0000000
--- a/etc/wsconsctl.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#      $OpenBSD: wsconsctl.conf,v 1.2 2007/05/14 05:06:03 tedu Exp $
-#
-# wscons configurable parameters
-#
-#keyboard.repeat.del1=200      # change keyboard repeat/delay
-#keyboard.repeat.deln=50
-#keyboard.encoding=ru          # use different keyboard encoding
-#keyboard.bell.volume=0                # mute keyboard beep
-#display.vblank=on             # enable vertical sync blank for screen burner
-#display.screen_off=60000      # set screen burner timeout to 60 seconds
-#display.msact=off             # disable screen unburn w/ mouse