Do not install sysctl.d/50-default.conf

The systemd package should not change kernel policies, at least until it will
become the only supported init system.

diff --git a/debian/changelog b/debian/changelog
index 4ff5b1e4803a5e9eac007dd5cb0770e7f98e840e..c7df4961c48cc3a4b7fe79ec8625b777253ef767 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,9 @@ systemd (204-9) UNRELEASED; urgency=medium
     (Closes: #655924)
   * Fix write_net_rules for systemd and sysvinit users by copying the
     temporary rules from /run/udev/ to /etc/udev/. (Closes: #735563)
+  * Do not install sysctl.d/50-default.conf because the systemd package
+    should not change kernel policies, at least until it will become
+    the only supported init system.
 
   [ Michael Stapelberg ]
   * Add systemd-dbg package, thanks Daniel Schaal (Closes: #742724).

diff --git a/debian/patches/0040-Remove-kernel.sysrq-setting-from-sysctl.d-50-default.patch b/debian/patches/0040-Remove-kernel.sysrq-setting-from-sysctl.d-50-default.patch
deleted file mode 100644 (file)
index 46f556b..0000000
--- a/debian/patches/0040-Remove-kernel.sysrq-setting-from-sysctl.d-50-default.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Michael Stapelberg <stapelberg@debian.org>
-Date: Wed, 19 Feb 2014 23:35:34 +0100
-Subject: Remove kernel.sysrq= setting from sysctl.d/50-default.conf
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-(Following Ben Hutching’s recommendation.)
-
-Closes: #725422
----
- sysctl.d/50-default.conf | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/sysctl.d/50-default.conf b/sysctl.d/50-default.conf
-index 46bae21..8d202a6 100644
---- a/sysctl.d/50-default.conf
-+++ b/sysctl.d/50-default.conf
-@@ -7,9 +7,6 @@
- 
- # See sysctl.d(5) and core(5) for for details.
- 
--# System Request functionality of the kernel (SYNC)
--kernel.sysrq = 16
--
- # Append the PID to the core filename
- kernel.core_uses_pid = 1
- 

diff --git a/debian/patches/series b/debian/patches/series
index 88ef471409d2c3f3ce29c2269dc628fa97558378..6df6aa8e66c55fbf0bd45aa1a0c5d728b5717ccd 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,7 +37,6 @@
 0037-Make-net.ifnames-opt-in-instead-of-opt-out.patch
 0038-Don-t-move-libgudev-to-lib.patch
 0039-Use-different-default-paths-for-various-binaries.patch
-0040-Remove-kernel.sysrq-setting-from-sysctl.d-50-default.patch
 0041-pam-Check-XDG_RUNTIME_DIR-owner.patch
 0042-Use-comment-systemd.-syntax-in-systemd.mount-man-pag.patch
 0043-Avoid-reloading-services-when-shutting-down.patch

diff --git a/debian/rules b/debian/rules
index f466e7121796e530a647409ec46733c2978d92d7..a8ca1446955f4f3b679ec67a0fe00d03b2b24e95 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -86,6 +86,7 @@ override_dh_install:
        rm -rf debian/install/*/usr/lib/kernel/install.d
        rm -rf debian/install/*/etc/rpm/
        rm -rf debian/install/*/etc/kernel/
+       rm debian/systemd/usr/lib/sysctl.d/50-default.conf
        find debian/install/ -name '*.la' -delete
        dh_install -pudev-udeb -plibudev1-udeb --sourcedir=debian/install/udeb
        dh_install $(BOOTSTRAP_DH_FLAGS) -Nudev-udeb -Nlibudev1-udeb --sourcedir=debian/install/deb --fail-missing