chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strv: detect non-assignments in env blocks properly in env_append()
[elogind.git]
/
src
/
dbus-mount.c
diff --git
a/src/dbus-mount.c
b/src/dbus-mount.c
index 4de00f7fac38d3b73614d53eb19e021d6e23e014..5fb9a3f0713092c6ac65eddcb32ffd255f057ada 100644
(file)
--- a/
src/dbus-mount.c
+++ b/
src/dbus-mount.c
@@
-50,7
+50,11
@@
BUS_INTROSPECTABLE_INTERFACE \
"</node>\n"
BUS_INTROSPECTABLE_INTERFACE \
"</node>\n"
-const char bus_mount_interface[] = BUS_MOUNT_INTERFACE;
+#define INTERFACES_LIST \
+ BUS_UNIT_INTERFACES_LIST \
+ "org.freedesktop.systemd1.Mount\0"
+
+const char bus_mount_interface[] _introspect_("Mount") = BUS_MOUNT_INTERFACE;
const char bus_mount_invalidating_properties[] =
"What\0"
const char bus_mount_invalidating_properties[] =
"What\0"
@@
-59,8
+63,7
@@
const char bus_mount_invalidating_properties[] =
"ExecMount\0"
"ExecUnmount\0"
"ExecRemount\0"
"ExecMount\0"
"ExecUnmount\0"
"ExecRemount\0"
- "ControlPID\0"
- "\0";
+ "ControlPID\0";
static int bus_mount_append_what(Manager *n, DBusMessageIter *i, const char *property, void *data) {
Mount *m = data;
static int bus_mount_append_what(Manager *n, DBusMessageIter *i, const char *property, void *data) {
Mount *m = data;
@@
-151,5
+154,5
@@
DBusHandlerResult bus_mount_message_handler(Unit *u, DBusConnection *c, DBusMess
{ NULL, NULL, NULL, NULL, NULL }
};
{ NULL, NULL, NULL, NULL, NULL }
};
- return bus_default_message_handler(u->meta.manager, c, message, INTROSPECTION, properties);
+ return bus_default_message_handler(u->meta.manager, c, message, INTROSPECTION,
INTERFACES_LIST,
properties);
}
}