From 13b617d2434e193eae6fddf9e3d9fb0cf8b809e5 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Tue, 15 Jul 2014 08:28:43 +0000
Subject: [PATCH] sysctl.conf moves to etc/examples

---
 etc/Makefile                   | 11 ++++++-----
 etc/changelist                 |  4 ++--
 etc/{ => examples}/sysctl.conf |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)
 rename etc/{ => examples}/sysctl.conf (97%)

diff --git a/etc/Makefile b/etc/Makefile
index e21725b58ed..38ca480ef24 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.372 2014/07/14 09:11:27 ajacoutot Exp $
+#	$OpenBSD: Makefile,v 1.373 2014/07/15 08:28:43 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -101,10 +101,11 @@ distribution-etc-root-var: distrib-dirs
 	    chown ${BINOWN} ${DESTDIR}/etc/ttys && \
 	    chgrp ${BINGRP} ${DESTDIR}/etc/ttys && \
 	    chmod 644 ${DESTDIR}/etc/ttys
-	cat sysctl.conf etc.${MACHINE}/sysctl.conf > ${DESTDIR}/etc/sysctl.conf && \
-	    chown ${BINOWN} ${DESTDIR}/etc/sysctl.conf && \
-	    chgrp ${BINGRP} ${DESTDIR}/etc/sysctl.conf && \
-	    chmod 644 ${DESTDIR}/etc/sysctl.conf
+	cat sysctl.conf etc.${MACHINE}/sysctl.conf > \
+	    ${DESTDIR}/etc/examples/sysctl.conf && \
+	    chown ${BINOWN} ${DESTDIR}/etc/examples/sysctl.conf && \
+	    chgrp ${BINGRP} ${DESTDIR}/etc/examples/sysctl.conf && \
+	    chmod 644 ${DESTDIR}/etc/examples/sysctl.conf
 	cat fbtab.head etc.${MACHINE}/fbtab fbtab.tail > ${DESTDIR}/etc/fbtab && \
 	    chown ${BINOWN} ${DESTDIR}/etc/fbtab && \
 	    chgrp ${BINGRP} ${DESTDIR}/etc/fbtab && \
diff --git a/etc/changelist b/etc/changelist
index 32330e93ee6..6ecbc9d1511 100644
--- a/etc/changelist
+++ b/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.93 2014/07/14 09:04:02 deraadt Exp $
+#	$OpenBSD: changelist,v 1.94 2014/07/15 08:28:43 deraadt Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -142,7 +142,7 @@
 /etc/ssl/cert.pem
 /etc/sudoers
 /etc/suid_profile
-/etc/sysctl.conf
++/etc/sysctl.conf
 /etc/syslog.conf
 /etc/sysmerge.ignore
 /etc/ttys
diff --git a/etc/sysctl.conf b/etc/examples/sysctl.conf
similarity index 97%
rename from etc/sysctl.conf
rename to etc/examples/sysctl.conf
index c297506d424..ae9c83519b4 100644
--- a/etc/sysctl.conf
+++ b/etc/examples/sysctl.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: sysctl.conf,v 1.58 2014/07/11 16:43:07 henning Exp $
+#	$OpenBSD: sysctl.conf,v 1.1 2014/07/15 08:28:43 deraadt Exp $
 #
 # This file contains a list of sysctl options the user wants set at
 # boot time.  See sysctl(3) and sysctl(8) for more information on
-- 
2.20.1