From 31e43b4033cc77998cd94792e83adf57664e5a1c Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Wed, 16 Jul 2014 13:21:33 +0000
Subject: [PATCH] mixerctl.conf wsconsctl.conf can properly become examples. As
 discussed a few days ago with aja

---
 src/etc/Makefile                      | 23 ++++++++++++-----------
 src/etc/{ => examples}/mixerctl.conf  |  2 +-
 src/etc/{ => examples}/wsconsctl.conf |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)
 rename src/etc/{ => examples}/mixerctl.conf (67%)
 rename src/etc/{ => examples}/wsconsctl.conf (85%)

diff --git a/src/etc/Makefile b/src/etc/Makefile
index 6b40a402..7bc827bb 100644
--- a/src/etc/Makefile
+++ b/src/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/src/etc/mixerctl.conf b/src/etc/examples/mixerctl.conf
similarity index 67%
rename from src/etc/mixerctl.conf
rename to src/etc/examples/mixerctl.conf
index 23d86704..0848627f 100644
--- a/src/etc/mixerctl.conf
+++ b/src/etc/examples/mixerctl.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: mixerctl.conf,v 1.1 2011/10/29 14:29:33 ajacoutot Exp $
+# $OpenBSD: mixerctl.conf,v 1.1 2014/07/16 13:21:33 deraadt Exp $
 #
 # mixerctl(1) configurable parameters. See mixerctl.conf(5) for details.
 #
diff --git a/src/etc/wsconsctl.conf b/src/etc/examples/wsconsctl.conf
similarity index 85%
rename from src/etc/wsconsctl.conf
rename to src/etc/examples/wsconsctl.conf
index 734089b1..d5fe752d 100644
--- a/src/etc/wsconsctl.conf
+++ b/src/etc/examples/wsconsctl.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: wsconsctl.conf,v 1.2 2007/05/14 05:06:03 tedu Exp $
+#	$OpenBSD: wsconsctl.conf,v 1.1 2014/07/16 13:21:33 deraadt Exp $
 #
 # wscons configurable parameters
 #