[systemd-commits] 2 commits - src/sysctl sysctl.d/50-default.conf

[Zbigniew Jędrzejewski-Szmek]

 src/sysctl/sysctl.c      |    2 +-
 sysctl.d/50-default.conf |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 16b65d7f463e91f6299dfa7b83d4b5fbeb109d1c
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Feb 26 19:05:51 2015 -0500

    sysctl: add some hints how to override settings
    
    Also a link to decent documentation for sysrq keys. It is surprising
    hard to find.
    
    https://lists.fedoraproject.org/pipermail/devel/2015-February/208412.html

diff --git a/sysctl.d/50-default.conf b/sysctl.d/50-default.conf
index f189233..def151b 100644
--- a/sysctl.d/50-default.conf
+++ b/sysctl.d/50-default.conf
@@ -5,9 +5,16 @@
 #  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
-# See sysctl.d(5) and core(5) for for details.
+# See sysctl.d(5) and core(5) for for documentation.
+
+# To override settings in this file, create a local file in /etc
+# (e.g. /etc/sysctl.d/90-override.conf), and put any assignments
+# there.
 
 # System Request functionality of the kernel (SYNC)
+#
+# Use kernel.sysrq = 1 to allow all keys.
+# See http://fedoraproject.org/wiki/QA/Sysrq for a list of values and keys.
 kernel.sysrq = 16
 
 # Append the PID to the core filename

commit 7933e4266f8124e3fca71f67757abd44155fa1cb
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Feb 26 19:00:11 2015 -0500

    sysctl: downgrade message about sysctl overrides to debug
    
    Printing it at info level was tedious. We don't do that for any other
    overrides.

diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index 275a5b7..2415d84 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -176,7 +176,7 @@ found:
                         if (streq(value, existing))
                                 continue;
 
-                        log_info("Overwriting earlier assignment of %s in file '%s'.", p, path);
+                        log_debug("Overwriting earlier assignment of %s in file '%s'.", p, path);
                         free(hashmap_remove(sysctl_options, p));
                         free(v);
                 }