summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2016-12-05 17:18:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-05 17:21:36 (GMT)
commitc53ddb2006f04051b00df3189fe8d35bb49ef3c7 (patch)
treefac7cc421a5ed2bab8baea153f71a3cc1a644ed9
parentc9f0a99050ec0050f0dbcd55d0cd2ab18848113f (diff)
downloadpoky-c53ddb2006f04051b00df3189fe8d35bb49ef3c7.tar.gz
systemd: re-enable mount propagation for udevd
With MountFlags=slave, those mounts then become private to the systemd-udevd namespace and are no longer accessible from outside the namespace, which is not expected [YOCTO #8613] (From OE-Core rev: 73f43d857fe0102033f25491007b6dbe3d5fa8ee) (From OE-Core rev: f9c35dfc6601901664dbef2cba3a9b96bef96e64) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit f2092e67ea880301058396b831a9a18905317d0d) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd/udev-re-enable-mount-propagation-for-udevd.patch31
-rw-r--r--meta/recipes-core/systemd/systemd_219.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/udev-re-enable-mount-propagation-for-udevd.patch b/meta/recipes-core/systemd/systemd/udev-re-enable-mount-propagation-for-udevd.patch
new file mode 100644
index 0000000..23e22d4
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/udev-re-enable-mount-propagation-for-udevd.patch
@@ -0,0 +1,31 @@
1From: Michael Biebl <biebl@debian.org>
2Date: Sat, 27 Sep 2014 04:19:24 +0200
3Subject: udev: re-enable mount propagation for udevd
4
5Upstream-Status: Backport [http://http.debian.net/debian/pool/main/s/systemd/systemd_215-17+deb8u4.debian.tar.xz]
6
7laptop-mode-tools remounts file systems from within a udev rule to apply
8certain mount options. With MountFlags=slave, those mounts then become private
9to the systemd-udevd namespace and are no longer accessible from outside the
10namespace.
11While the root cause is the broken behaviour of laptop-mode-tools, with mount
12propagation turned off, this can result in a read-only root file system.
13Therefore revert the relevant parts from commit
14c2c13f2df42e0691aecabe3979ea81cd7faa35c7 to re-enable mount propagation for
15udevd.
16
17Once affected packages have been fixed, this patch should be dropped
18again.
19
20Closes: #762018
21diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
22index e7216d6..1e9a600 100644
23--- a/units/systemd-udevd.service.in
24+++ b/units/systemd-udevd.service.in
25@@ -21,6 +21,5 @@ Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket
26 Restart=always
27 RestartSec=0
28 ExecStart=@rootlibexecdir@/systemd-udevd
29-MountFlags=slave
30 KillMode=mixed
31 WatchdogSec=1min
diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index 57cbe08..bb95c30 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -50,6 +50,7 @@ SRC_URI = "git://github.com/systemd/systemd-stable;branch=v219-stable;protocol=g
50 file://00-create-volatile.conf \ 50 file://00-create-volatile.conf \
51 file://init \ 51 file://init \
52 file://run-ptest \ 52 file://run-ptest \
53 file://udev-re-enable-mount-propagation-for-udevd.patch \
53 " 54 "
54 55
55S = "${WORKDIR}/git" 56S = "${WORKDIR}/git"