X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fdbus-manager.c;h=c21cb5f5766c46908057971369d14c062d4eefd7;hb=6edef9c587b374a81f4ecc23359bb958857d3def;hp=7d4703b88b04e4e0c2baa1036442885bad08745e;hpb=c826cda421f0272275342173e16250adcdf6fbd4;p=elogind.git

diff --git a/src/dbus-manager.c b/src/dbus-manager.c
index 7d4703b88..c21cb5f57 100644
--- a/src/dbus-manager.c
+++ b/src/dbus-manager.c
@@ -206,6 +206,10 @@
 #define INTROSPECTION_END                                               \
         "</node>\n"
 
+#define INTERFACES_LIST                              \
+        BUS_GENERIC_INTERFACES_LIST                  \
+        "org.freedesktop.systemd1.Manager\0"
+
 const char bus_manager_interface[] _introspect_("Manager") = BUS_MANAGER_INTERFACE;
 
 static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_manager_append_running_as, manager_running_as, ManagerRunningAs);
@@ -219,7 +223,7 @@ static int bus_manager_append_tainted(Manager *m, DBusMessageIter *i, const char
         assert(i);
         assert(property);
 
-        if (path_is_mount_point("/usr") > 0 || dir_is_empty("/usr") > 0)
+        if (dir_is_empty("/usr") > 0)
                 e = stpcpy(e, "usr-separate-fs");
 
         if (readlink_malloc("/etc/mtab", &p) < 0) {
@@ -1021,7 +1025,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
                 m->environment = e;
 
         } else
-                return bus_default_message_handler(m, connection, message, NULL, properties);
+                return bus_default_message_handler(m, connection, message, NULL, INTERFACES_LIST, properties);
 
         if (job_type != _JOB_TYPE_INVALID) {
                 const char *name, *smode, *old_name = NULL;