From 801ccd93e2a9907a18528bdf0f5b3eb3a4945afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 7 Oct 2014 00:39:08 -0400
Subject: [PATCH] Steal sysctl.conf from initscripts

Basically another README file for stuff that we manage.
---
 sysctl.conf.README | 10 ++++++++++
 systemd.spec       |  7 +++++++
 2 files changed, 17 insertions(+)
 create mode 100644 sysctl.conf.README

diff --git a/sysctl.conf.README b/sysctl.conf.README
new file mode 100644
index 0000000..41c0c41
--- /dev/null
+++ b/sysctl.conf.README
@@ -0,0 +1,10 @@
+# sysctl settings are defined through files in
+# /usr/lib/sysctl.d/, /run/sysctl.d/, and /etc/sysctl.d/.
+#
+# Vendors settings live in /usr/lib/sysctl.d/.
+# To override a whole file, create a new file with the same in
+# /etc/sysctl.d/ and put new settings there. To override
+# only specific settings, add a file with a lexically later
+# name in /etc/sysctl.d/ and put new settings there.
+#
+# For more information, see sysctl.conf(5) and sysctl.d(5).
diff --git a/systemd.spec b/systemd.spec
index 7b2bfc4..a09b720 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -34,6 +34,7 @@ Source3:        85-display-manager.preset
 # Prevent accidental removal of the systemd package
 Source4:        yum-protect-systemd.conf
 Source5:        inittab
+Source6:        sysctl.conf.README
 
 # Patch series is available from http://cgit.freedesktop.org/systemd/systemd-stable/log/?h=v215-stable
 # GIT_DIR=~/src/systemd/.git git format-patch-ab -M -N --no-signature v216..master
@@ -877,6 +878,10 @@ chmod 600 %{buildroot}/etc/crypttab
 
 install -m 0644 %{SOURCE5} %{buildroot}/etc/
 
+mkdir -p %{buildroot}/etc/sysctl.d
+install -m 0644 %{SOURCE6} %{buildroot}/etc/sysctl.conf
+ln -s ../sysctl.conf %{buildroot}/etc/sysctl.d/99-sysctl.conf
+
 # We create all wants links manually at installation time to make sure
 # they are not owned and hence overriden by rpm after the user deleted
 # them.
@@ -1103,6 +1108,8 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
 %dir %{_sysconfdir}/udev/rules.d
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab
 /etc/inittab
+%config(noreplace) %{_sysconfdir}/sysctl.conf
+%{_sysconfdir}/sysctl.d/99-sysctl.conf
 %dir %{_prefix}/lib/systemd
 %{_prefix}/lib/systemd/system-generators
 %{_prefix}/lib/systemd/user-generators