Drop udev-re-enable-mount-propagation-for-udevd.patch

I. e. run udevd in its own slave mount name space again. laptop-mode-tools 1.68
fixed the original bug (#762018), thus add a Breaks: to earlier versions.
This commit is contained in:
Martin Pitt 2016-04-26 23:42:20 +02:00
parent 172fc64bfc
commit d529d04775
4 changed files with 4 additions and 34 deletions

3
debian/changelog vendored
View File

@ -9,6 +9,9 @@ systemd (229-6) UNRELEASED; urgency=medium
$mail-transport-agent is not widely used (not even by our default MTA
exim4).
* Unify our two patches for Debian specific configuration files.
* Drop udev-re-enable-mount-propagation-for-udevd.patch, i. e. run udevd in
its own slave mount name space again. laptop-mode-tools 1.68 fixed the
original bug (#762018), thus add a Breaks: to earlier versions.
-- Martin Pitt <mpitt@debian.org> Tue, 26 Apr 2016 22:20:43 +0200

1
debian/control vendored
View File

@ -72,6 +72,7 @@ Breaks: lvm2 (<< 2.02.104-1),
systemd-shim (<< 8-2),
ifupdown (<< 0.8.5~),
udev (<< 228-5),
laptop-mode-tools (<< 1.68~)
Replaces: udev (<< 228-5),
Conflicts: klogd
Description: system and service manager

View File

@ -1,33 +0,0 @@
From: Michael Biebl <biebl@debian.org>
Date: Sat, 27 Sep 2014 04:19:24 +0200
Subject: udev: re-enable mount propagation for udevd
laptop-mode-tools remounts file systems from within a udev rule to apply
certain mount options. With MountFlags=slave, those mounts then become private
to the systemd-udevd namespace and are no longer accessible from outside the
namespace.
While the root cause is the broken behaviour of laptop-mode-tools, with mount
propagation turned off, this can result in a read-only root file system.
Therefore revert the relevant parts from commit
c2c13f2df42e0691aecabe3979ea81cd7faa35c7 to re-enable mount propagation for
udevd.
Once affected packages have been fixed, this patch should be dropped
again.
Closes: #762018
---
units/systemd-udevd.service.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
index 79f28c8..8c5a9cc 100644
--- a/units/systemd-udevd.service.in
+++ b/units/systemd-udevd.service.in
@@ -21,6 +21,5 @@ Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket
Restart=always
RestartSec=0
ExecStart=@rootlibexecdir@/systemd-udevd
-MountFlags=slave
KillMode=mixed
WatchdogSec=3min

View File

@ -48,7 +48,6 @@ debian/Adjust-systemd-user-pam-config-file-for-Debian.patch
debian/Add-support-for-TuxOnIce-hibernation.patch
debian/Stop-syslog.socket-when-entering-emergency-mode.patch
debian/Include-additional-directories-in-ProtectSystem.patch
debian/udev-re-enable-mount-propagation-for-udevd.patch
debian/Re-enable-journal-forwarding-to-syslog.patch
debian/Don-t-enable-audit-by-default.patch
debian/util-Add-hidden-suffixes-for-ucf.patch