diff options
author | Roy Li <rongqing.li@windriver.com> | 2016-12-05 11:18:06 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-05 17:20:46 +0000 |
commit | f9c35dfc6601901664dbef2cba3a9b96bef96e64 (patch) | |
tree | 3268c14738c43ff6ff2d3a3990210191f85d915b | |
parent | 511ea0fcc9c238ad8e3b3089ec2bcf82bb1ecc77 (diff) | |
download | openembedded-core-fido.tar.gz |
systemd: re-enable mount propagation for udevdfido
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)
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.patch | 31 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_219.bb | 1 |
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 @@ +From: Michael Biebl <biebl@debian.org> +Date: Sat, 27 Sep 2014 04:19:24 +0200 +Subject: udev: re-enable mount propagation for udevd + +Upstream-Status: Backport [http://http.debian.net/debian/pool/main/s/systemd/systemd_215-17+deb8u4.debian.tar.xz] + +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 +diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in +index e7216d6..1e9a600 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=1min diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index 57cbe08346..bb95c305db 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 file://00-create-volatile.conf \ file://init \ file://run-ptest \ + file://udev-re-enable-mount-propagation-for-udevd.patch \ " S = "${WORKDIR}/git" |