From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 16 Dec 2013 20:06:34 +0000 (+0100)
Subject: bus: also mask dbus.service in generator if kdbus is found
X-Git-Tag: v209~890
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=010b2b8d7a694e1e404e35db90e938f6a476bf2f;hp=77e96a62476b8df284e19a016ad55e6e3e721fb2

bus: also mask dbus.service in generator if kdbus is found
---

diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c
index b0e49bc05..d7ecd7f9a 100644
--- a/src/dbus1-generator/dbus1-generator.c
+++ b/src/dbus1-generator/dbus1-generator.c
@@ -276,6 +276,12 @@ static int link_compatibility(const char *units) {
                 return -errno;
         }
 
+        t = strappenda(arg_dest, "/" SPECIAL_DBUS_SERVICE);
+        if (symlink("/dev/null", t) < 0) {
+                log_error("Failed to mask %s: %m", t);
+                return -errno;
+        }
+
         return 0;
 }