shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-26 09:57:26 +03:00
Code

service: default to Type=dbus if BusName= is specified

Browse Source
This commit is contained in:
Lennart Poettering 2012-05-03 14:46:29 +02:00
parent 7e2668c6fd
commit 0b86feac50
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
man/systemd.service.xml
View File

@ -126,8 +126,9 @@
<para>If set to
<option>simple</option> (the default
value) it is expected that the process
configured with
value if <varname>BusName=</varname>
is not specified) it is expected that
the process configured with
<varname>ExecStart=</varname> is the
main process of the service. In this
mode, if the process offers
@ -182,7 +183,9 @@
option configured implicitly gain
dependencies on the
<filename>dbus.socket</filename>
unit.</para>
unit. This type is the default if
<varname>BusName=</varname> is
specified.</para>
<para>Behaviour of
<option>notify</option> is similar to

4
src/core/service.c
View File

@ -115,6 +115,7 @@ static void service_init(Unit *u) {
s->timeout_usec = DEFAULT_TIMEOUT_USEC;
s->restart_usec = DEFAULT_RESTART_USEC;
s->type = _SERVICE_TYPE_INVALID;
s->watchdog_watch.type = WATCH_INVALID;
@ -1216,6 +1217,9 @@ static int service_load(Unit *u) {
/* This is a new unit? Then let's add in some extras */
if (u->load_state == UNIT_LOADED) {
if (s->type == _SERVICE_TYPE_INVALID)
s->type = s->bus_name ? SERVICE_DBUS : SERVICE_SIMPLE;
service_fix_output(s);
if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)