diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-01-15 15:15:52 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-03-02 14:48:49 +0000 |
| commit | 18a0a8892b99f235e3897d9e5c600da00c61ef0a (patch) | |
| tree | b7c19d98de5a897a5ebfc4b9ac2a8b0e55b8dfcc | |
| parent | be4670767377a08b0c6cabbca1000ca614174c2c (diff) | |
| download | dbus-18a0a8892b99f235e3897d9e5c600da00c61ef0a.tar.gz | |
bus: Notify systemd when we are ready
Signed-off-by: Simon McVittie <smcv@collabora.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=104641
Reviewed-by: Philip Withnall <withnall@endlessm.com>
| -rw-r--r-- | bus/dbus.service.in | 2 | ||||
| -rw-r--r-- | bus/main.c | 1 | ||||
| -rw-r--r-- | bus/systemd-user/dbus.service.in | 2 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps-util-unix.c | 12 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps-util-win.c | 5 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps.h | 2 |
6 files changed, 24 insertions, 0 deletions
diff --git a/bus/dbus.service.in b/bus/dbus.service.in index ca0b7e96..3713810b 100644 --- a/bus/dbus.service.in +++ b/bus/dbus.service.in @@ -4,6 +4,8 @@ Documentation=man:dbus-daemon(1) Requires=dbus.socket [Service] +Type=notify +NotifyAccess=main ExecStart=@EXPANDED_BINDIR@/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only ExecReload=@EXPANDED_BINDIR@/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig OOMScoreAdjust=-900 @@ -716,6 +716,7 @@ main (int argc, char **argv) #endif /* DBUS_UNIX */ _dbus_verbose ("We are on D-Bus...\n"); + _dbus_daemon_report_ready (); _dbus_loop_run (bus_context_get_loop (context)); bus_context_shutdown (context); diff --git a/bus/systemd-user/dbus.service.in b/bus/systemd-user/dbus.service.in index 7ceffbee..b291b923 100644 --- a/bus/systemd-user/dbus.service.in +++ b/bus/systemd-user/dbus.service.in @@ -4,5 +4,7 @@ Documentation=man:dbus-daemon(1) Requires=dbus.socket [Service] +Type=notify +NotifyAccess=main ExecStart=@EXPANDED_BINDIR@/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only ExecReload=@EXPANDED_BINDIR@/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c index b841bf63..838cd932 100644 --- a/dbus/dbus-sysdeps-util-unix.c +++ b/dbus/dbus-sysdeps-util-unix.c @@ -1519,3 +1519,15 @@ _dbus_get_session_config_file (DBusString *str) return _dbus_string_append (str, DBUS_SESSION_CONFIG_FILE); } + +/** + * Report to a service manager that the daemon calling this function is + * ready for use. This is currently only implemented for systemd. + */ +void +_dbus_daemon_report_ready (void) +{ +#ifdef HAVE_SYSTEMD + sd_notify (0, "READY=1"); +#endif +} diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c index 1ef4ae6c..f613130e 100644 --- a/dbus/dbus-sysdeps-util-win.c +++ b/dbus/dbus-sysdeps-util-win.c @@ -1654,3 +1654,8 @@ _dbus_get_session_config_file (DBusString *str) return _dbus_get_config_file_name(str, "session.conf"); } + +void +_dbus_daemon_report_ready (void) +{ +} diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index b9b0c440..b2943906 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -687,6 +687,8 @@ dbus_bool_t _dbus_rlimit_restore_fd_limit (DBusRLimit *saved, DBusError *error); void _dbus_rlimit_free (DBusRLimit *lim); +void _dbus_daemon_report_ready (void); + /** @} */ DBUS_END_DECLS |