disable duplicate (with rc-scripts) kernel.sysrq

diff --git a/sysctl.patch b/sysctl.patch
new file mode 100644 (file)
index 0000000..f1bd36b
--- /dev/null
+++ b/sysctl.patch
@@ -0,0 +1,21 @@
+kernel.sysrq is defined in /etc/sysctl.conf owned by rc-scripts.
+having it here as well, will print notice:
+
+# /lib/systemd/systemd-sysctl
+Overwriting earlier assignment of kernel/sysrq in file '/etc/sysctl.d/99-sysctl.conf'.
+
+--- systemd-221/sysctl.d/50-default.conf~      2015-02-28 18:38:38.000000000 +0200
++++ systemd-221/sysctl.d/50-default.conf       2015-08-01 22:43:16.307974188 +0300
+@@ -11,12 +11,6 @@
+ # (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
+ kernel.core_uses_pid = 1
+ 

diff --git a/systemd.spec b/systemd.spec
index 1b2ead23c94315ec5055b0962fede421893e2799..ffcec0e49389d9cb1ecdbe522cc0a77abc48f535 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -72,6 +72,7 @@ Patch9:               %{name}-configfs.patch
 Patch10:       pld-boot_efi_mount.patch
 Patch11:       optional-tmp-on-tmpfs.patch
 Patch12:       uids_gids.patch
+Patch13:       sysctl.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -656,6 +657,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %build