Drop our Check-for-kmod-binary.patch

The upstream patch units-conditionalize-static-device-node-logic-on-CAP.patch
supersedes it. Containers usually don't have CAP_SYS_MODULE, and in the rare
case when they actually do (i. e. you want them to handle modules), it's better
to actually do get an error message if kmod is not available.

diff --git a/debian/changelog b/debian/changelog
index 8d6c6afa5557eb700b6f416c0545f06551e23a61..fb4588a9b5a352cf27258417369e30faae272bad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ systemd (215-6) UNRELEASED; urgency=medium
     as long as it isn't in our base images (see Debian #745876)
   * Run tests during package build. For the first round don't make them fatal
     for now (that will happen once we see results from all the architectures).
+  * Drop our Check-for-kmod-binary.patch as the upstream patch
+    units-conditionalize-static-device-node-logic-on-CAP.patch supersedes it.
 
  -- Martin Pitt <mpitt@debian.org>  Sun, 12 Oct 2014 17:29:00 +0200
 

diff --git a/debian/patches/Check-for-kmod-binary.patch b/debian/patches/Check-for-kmod-binary.patch
deleted file mode 100644 (file)
index c91ea54..0000000
--- a/debian/patches/Check-for-kmod-binary.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Biebl <biebl@debian.org>
-Date: Sun, 27 Apr 2014 15:41:26 +0200
-Subject: Check for kmod binary
-
-Creating the list of dead device nodes requires kmod. Inside containers
-this is not strictly required so we don't want a hard dependency on the
-kmod package. If the binary does not exist kmod-static-nodes.service
-will fail, so add a condition to check if the binary is available.
----
- units/kmod-static-nodes.service.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
-index 0934a87..076e316 100644
---- a/units/kmod-static-nodes.service.in
-+++ b/units/kmod-static-nodes.service.in
-@@ -11,6 +11,7 @@ DefaultDependencies=no
- Before=sysinit.target systemd-tmpfiles-setup-dev.service
- ConditionCapability=CAP_SYS_MODULE
- ConditionPathExists=/lib/modules/%v/modules.devname
-+ConditionFileIsExecutable=@KMOD@
- 
- [Service]
- Type=oneshot

diff --git a/debian/patches/series b/debian/patches/series
index eeb84489d195354eed3d64c0bcb8c320d4eea186..e993165f4fdfa26136a45fca797d91479f8e2503 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -141,7 +141,6 @@ Set-default-polling-interval-on-removable-devices-as.patch
 insserv.conf-generator.patch
 Add-targets-for-compatibility-with-Debian-insserv-sy.patch
 more-cd-aliases.patch
-Check-for-kmod-binary.patch
 Adjust-systemd-user-pam-config-file-for-Debian.patch
 Add-run-initctl-support-to-SysV-compat-tools.patch
 Add-support-for-TuxOnIce-hibernation.patch