From 231d3e4ec98e3792519ffbe7f081e592ec31fdff Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 18 Oct 2012 16:05:51 -0400
Subject: Add a default /etc/sysctl.conf that describes how to change values,
 and where the defaults now live. (#760254)

---
 Makefile           | 1 +
 initscripts.spec   | 1 +
 sysctl.conf.README | 4 ++++
 3 files changed, 6 insertions(+)
 create mode 100644 sysctl.conf.README

diff --git a/Makefile b/Makefile
index cc3231b2..e8f3fb58 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,7 @@ install:
 	  install -m644 sysctl.conf.sparc $(ROOT)/usr/lib/sysctl.d/00-system.conf ; fi
 	if uname -m | grep -q s390 ; then \
 	  install -m644 sysctl.conf.s390 $(ROOT)/usr/lib/sysctl.d/00-system.conf ; fi
+	install -m 644 sysctl.conf.README $(ROOT)/etc/sysctl.conf
 
 	install -m755 -d $(ROOT)/etc/rc.d $(ROOT)/etc/sysconfig
 	cp -af rc.d/init.d $(ROOT)/etc/rc.d/
diff --git a/initscripts.spec b/initscripts.spec
index 0e850d2f..d4f2d578 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -168,6 +168,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/rc.d/init.d
 /etc/rc.d/init.d/*
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/rc.d/rc.local
+%config(noreplace) /etc/sysctl.conf
 /usr/lib/sysctl.d/00-system.conf
 %exclude /etc/profile.d/debug*
 /etc/profile.d/*
diff --git a/sysctl.conf.README b/sysctl.conf.README
new file mode 100644
index 00000000..24cfe007
--- /dev/null
+++ b/sysctl.conf.README
@@ -0,0 +1,4 @@
+# System default settings live in /usr/lib/sysctl.d/00-system.conf.
+# To override those settings, enter new settings here, or in an /etc/sysctl.d/<name>.conf file
+#
+# For more information, see sysctl.conf(5) and sysctl.d(5).
-- 
cgit v1.2.1