[gnome-ostree] colord: Add workaround for OSTree breaking systemd's PrivateTmp
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] colord: Add workaround for OSTree breaking systemd's PrivateTmp
- Date: Wed, 21 Nov 2012 14:18:48 +0000 (UTC)
commit 0dd45902a1bcaa082b517c05caa837aedc2e64da
Author: Colin Walters <walters verbum org>
Date: Wed Nov 21 09:17:53 2012 -0500
colord: Add workaround for OSTree breaking systemd's PrivateTmp
Temporary patch.
manifest.json | 3 ++-
patches/colord-disable-private-tmp.patch | 27 +++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 0763dcb..4d574ea 100644
--- a/manifest.json
+++ b/manifest.json
@@ -633,7 +633,8 @@
{"src": "git:git://gitorious.org/gusb/gusb.git"},
{"src": "git:git://gitorious.org/colord/master.git",
- "name": "colord"},
+ "name": "colord",
+ "patches": ["colord-disable-private-tmp.patch"]},
{"src": "linuxwacom:libwacom",
"patches": ["libwacom-autogen.patch"]},
diff --git a/patches/colord-disable-private-tmp.patch b/patches/colord-disable-private-tmp.patch
new file mode 100644
index 0000000..ae75163
--- /dev/null
+++ b/patches/colord-disable-private-tmp.patch
@@ -0,0 +1,27 @@
+From 65ac69c977dae13a3302d9c042c080c3c3a1ed76 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters verbum org>
+Date: Wed, 21 Nov 2012 08:48:43 -0500
+Subject: [PATCH] colord.service: Disable PrivateTmp for now
+
+It breaks inside gnome-ostree because systemd gets confused
+by the way we set up bind mounts presently. This is a temporary
+workaround.
+
+http://lists.freedesktop.org/archives/systemd-devel/2012-September/006668.html
+---
+ data/colord.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/colord.service.in b/data/colord.service.in
+index b473397..d0e29e7 100644
+--- a/data/colord.service.in
++++ b/data/colord.service.in
+@@ -9,4 +9,4 @@ User= daemon_user@
+ # We think that udev's AF_NETLINK messages are being filtered when
+ # network namespacing is on.
+ # PrivateNetwork=yes
+-PrivateTmp=yes
++#PrivateTmp=yes
+--
+1.7.11.7
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]