- add some docu to /etc/sysctl.conf (bnc#700174)

OBS-URL: https://build.opensuse.org/package/show/Base:System/procps?expand=0&rev=54

procps-3.2.8-read-sysctls-also-from-boot-sysctl.conf-kernelversion.diff

@@ -1,12 +1,26 @@
-From 16c356dc827152883b1e0d5c5f195eeff6f85daf Mon Sep 17 00:00:00 2001
+From 0d9241b9af6ad3533477b11583c3e866cc2e6fd3 Mon Sep 17 00:00:00 2001
 From: Ludwig Nussel <ludwig.nussel@suse.de>
 Date: Tue, 17 May 2011 16:35:18 +0200
 Subject: [PATCH 3/3] read sysctls also from /boot/sysctl.conf-$kernelversion
 
 ---
+ sysctl.8 |    2 +-
  sysctl.c |   12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
+ 2 files changed, 13 insertions(+), 1 deletions(-)
 
+diff --git a/sysctl.8 b/sysctl.8
+index 406bb59..03a8980 100644
+--- a/sysctl.8
++++ b/sysctl.8
+@@ -66,7 +66,7 @@ Display all values currently available.
+ Display all values currently available in table form.
+ .TP
+ .B "--system"
+-Load settings from system configuration files (/lib/sysctl.d/*.conf,
++Load settings from system configuration files (/boot/sysctl.conf-<kernelversion>, /lib/sysctl.d/*.conf,
+ /usr/lib/sysctl.d/*.conf, /usr/local/lib/sysctl.d/*.conf,
+ /etc/sysctl.d/*.conf, /run/sysctl.d/*.conf, /etc/sysctl.conf)
+ .TP
 diff --git a/sysctl.c b/sysctl.c
 index 1867777..a38a81c 100644
 --- a/sysctl.c

procps.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug 26 12:41:30 UTC 2011 - lnussel@suse.de
+
+- add some docu to /etc/sysctl.conf (bnc#700174)
+
 -------------------------------------------------------------------
 Fri Aug 26 09:36:03 UTC 2011 - lnussel@suse.de
 

procps.spec

@@ -181,7 +181,27 @@ rm -rf $RPM_BUILD_ROOT
 %post
 %{fillup_and_insserv -ny boot.sysctl boot.sysctl}
 #
-test -e /etc/sysctl.conf || > /etc/sysctl.conf
+test -e /etc/sysctl.conf || cat <<EOF >/etc/sysctl.conf
+####
+#
+# /etc/sysctl.conf is meant for local sysctl settings
+#
+# sysctl reads settings from the following locations:
+#   /boot/sysctl.conf-<kernelversion>
+#   /lib/sysctl.d/*.conf
+#   /usr/lib/sysctl.conf.d/*.conf
+#   /usr/local/lib/sysctl.d/*.conf
+#   /etc/sysctl.d/*.conf
+#   /run/sysctl.d/*.conf
+#   /etc/sysctl.conf
+#
+# To disable or override a distribution provided file just place a
+# file with the same name in /etc/sysctl.d/
+#
+# See sysctl.conf(5) and sysctl(8) for more information
+#
+####
+EOF
 
 %postun
 %insserv_cleanup