summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2016-05-10 10:09:33 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-22 16:11:13 +0100
commitf2092e67ea880301058396b831a9a18905317d0d (patch)
tree150f2d07fbfc263f75641b65a3d1ce09918a562c
parent13df45b74e6f083856d27847398e7cfeffa59d32 (diff)
downloadpoky-f2092e67ea880301058396b831a9a18905317d0d.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 (From OE-Core rev: 73f43d857fe0102033f25491007b6dbe3d5fa8ee) 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>
-rw-r--r--meta/recipes-core/systemd/systemd/udev-re-enable-mount-propagation-for-udevd.patch31
-rw-r--r--meta/recipes-core/systemd/systemd_229.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 0000000000..23e22d40e6
--- /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_229.bb b/meta/recipes-core/systemd/systemd_229.bb
index a2d35f8241..ae63c58056 100644
--- a/meta/recipes-core/systemd/systemd_229.bb
+++ b/meta/recipes-core/systemd/systemd_229.bb
@@ -54,6 +54,7 @@ SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \
54 file://0021-include-missing.h-for-getting-secure_getenv-definiti.patch \ 54 file://0021-include-missing.h-for-getting-secure_getenv-definiti.patch \
55 file://0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \ 55 file://0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \
56 file://0023-build-sys-fix-build-with-libgrcypt-disabled.patch \ 56 file://0023-build-sys-fix-build-with-libgrcypt-disabled.patch \
57 file://udev-re-enable-mount-propagation-for-udevd.patch \
57" 58"
58SRC_URI_append_libc-uclibc = "\ 59SRC_URI_append_libc-uclibc = "\
59 file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \ 60 file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \