[gnome-continuous] manifest: Revert systemd patch that breaks ostree
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] manifest: Revert systemd patch that breaks ostree
- Date: Tue, 24 Feb 2015 18:04:08 +0000 (UTC)
commit 1e2bc8db789c988ba22aee972acffaa59680bd4d
Author: Colin Walters <walters verbum org>
Date: Tue Feb 24 13:02:51 2015 -0500
manifest: Revert systemd patch that breaks ostree
I think it's that remounting the rootfs read/write transiently causes
the device to go inactive, which triggers unmounts.
manifest.json | 1 +
...-mount-add-dependencies-to-dynamically-mo.patch | 27 ++++++++++++++++++++
2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index b347de9..74ac6e2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -96,6 +96,7 @@
{"src": "git:git://anongit.freedesktop.org/systemd/systemd",
"component": "minimal",
"initramfs-depends": true,
+ "patches": ["systemd-Revert-core-mount-add-dependencies-to-dynamically-mo.patch"],
"cflags": {
"x86_64": "-O0 -g -m64 -mtune=generic",
"i686": "-O0 -g -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables"},
diff --git a/patches/systemd-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
b/patches/systemd-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
new file mode 100644
index 0000000..8176883
--- /dev/null
+++ b/patches/systemd-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
@@ -0,0 +1,27 @@
+From eb7a760052667c5a35637901de9359c377263804 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Tue, 24 Feb 2015 10:12:28 -0500
+Subject: [PATCH] Revert "core/mount: add dependencies to dynamically mounted
+ mounts too"
+
+This reverts commit 06e97888883e2cc12eb6514e80c7f0014295f59b.
+---
+ src/core/mount.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 40037e7..cddb5e2 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -295,7 +295,7 @@ static int mount_add_device_links(Mount *m) {
+
+ assert(m);
+
+- p = get_mount_parameters(m);
++ p = get_mount_parameters_fragment(m);
+ if (!p)
+ return 0;
+
+--
+1.8.3.1
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]