summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <joshua.lock@collabora.co.uk>2015-07-08 10:35:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-09 18:00:17 +0100
commit32cd0c8e957eb71c07558347b3309abaca437f4a (patch)
tree034a10b8ec09d87a789d15bb3a0fbab42dae4972 /meta
parent91c1574fbeaba25bbb19e8166cfc9cda93e64aaf (diff)
downloadpoky-32cd0c8e957eb71c07558347b3309abaca437f4a.tar.gz
systemd: fix immediate unmount of mountpoints not in fstab
Systemd 219 immediately unmounts any mounts which don't exist in fstab. See FDo bug #89383: https://bugs.freedesktop.org/show_bug.cgi?id=89383 Patch from Fedora: http://pkgs.fedoraproject.org/cgit/systemd.git/commit/?h=f22&id=9bbe0e92dc59d5a42258c729b105a7d9901eb35e (From OE-Core rev: a708514a58fd609b7f8c1a4bd4ab35902681f59b) Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd/0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch36
-rw-r--r--meta/recipes-core/systemd/systemd_219.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch b/meta/recipes-core/systemd/systemd/0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
new file mode 100644
index 0000000000..d69cfe0bd8
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
@@ -0,0 +1,36 @@
1From eb7a760052667c5a35637901de9359c377263804 Mon Sep 17 00:00:00 2001
2From: Colin Walters <walters@verbum.org>
3Date: Tue, 24 Feb 2015 10:12:28 -0500
4Subject: [PATCH] Revert "core/mount: add dependencies to dynamically mounted
5 mounts too"
6
7This reverts commit 06e97888883e2cc12eb6514e80c7f0014295f59b.
8
9This patch was imported from Fedora (http://pkgs.fedoraproject.org/cgit/systemd.git/commit/?h=f22&id=9bbe0e92dc59d5a42258c729b105a7d9901eb35e).
10
11It fixes an issue where mount points not listed in fstab are immediately
12unmounted after a call to mount.
13
14Upstream-Status: Inappropriate [fixed upstream]
15
16Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
17---
18 src/core/mount.c | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/src/core/mount.c b/src/core/mount.c
22index 40037e7..cddb5e2 100644
23--- a/src/core/mount.c
24+++ b/src/core/mount.c
25@@ -295,7 +295,7 @@ static int mount_add_device_links(Mount *m) {
26
27 assert(m);
28
29- p = get_mount_parameters(m);
30+ p = get_mount_parameters_fragment(m);
31 if (!p)
32 return 0;
33
34--
351.8.3.1
36
diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index 6ed4fe0995..bac2784370 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -44,6 +44,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd-stable;branch=v219-stab
44 file://0014-Revert-rules-remove-firmware-loading-rules.patch \ 44 file://0014-Revert-rules-remove-firmware-loading-rules.patch \
45 file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \ 45 file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \
46 file://tmpfiles-pam.patch \ 46 file://tmpfiles-pam.patch \
47 file://0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch \
47 file://touchscreen.rules \ 48 file://touchscreen.rules \
48 file://00-create-volatile.conf \ 49 file://00-create-volatile.conf \
49 file://init \ 50 file://init \