summaryrefslogtreecommitdiff
path: root/src/core/automount.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-11-19 21:12:59 +0100
committerLennart Poettering <lennart@poettering.net>2013-11-20 20:52:36 +0100
commit718db96199eb307751264e4163555662c9a389fa (patch)
tree9ec8467596ba1acba76bb6273c7797baf68c1a00 /src/core/automount.h
parent3febea3a0b0a968ea281e7959c1654cbaf95c9bf (diff)
core: convert PID 1 to libsystemd-bus
This patch converts PID 1 to libsystemd-bus and thus drops the dependency on libdbus. The only remaining code using libdbus is a test case that validates our bus marshalling against libdbus' marshalling, and this dependency can be turned off. This patch also adds a couple of things to libsystem-bus, that are necessary to make the port work: - Synthesizing of "Disconnected" messages when bus connections are severed. - Support for attaching multiple vtables for the same interface on the same path. This patch also fixes the SetDefaultTarget() and GetDefaultTarget() bus calls which used an inappropriate signature. As a side effect we will now generate PropertiesChanged messages which carry property contents, rather than just invalidation information.
Diffstat (limited to 'src/core/automount.h')
-rw-r--r--src/core/automount.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/automount.h b/src/core/automount.h
index a7a25d34e0..60f5522389 100644
--- a/src/core/automount.h
+++ b/src/core/automount.h
@@ -49,8 +49,8 @@ struct Automount {
char *where;
int pipe_fd;
+ sd_event_source *pipe_event_source;
mode_t directory_mode;
- Watch pipe_watch;
dev_t dev_id;
Set *tokens;