X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-service.c;h=0451790d83deec76237f42551d82411c17038880;hb=90c3f79dc74229134818e78cb97d315e28ee93b5;hp=3db9339d455c7c21ab10a1af28256e9ca6d5afdc;hpb=aec8de63b14a93b91b85dc15bf879604352fbbe1;p=elogind.git diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c index 3db9339d4..0451790d8 100644 --- a/src/core/dbus-service.c +++ b/src/core/dbus-service.c @@ -96,6 +96,25 @@ static int bus_service_set_transient_property( return 1; + } else if (streq(name, "Type")) { + const char *t; + ServiceType k; + + r = sd_bus_message_read(message, "s", &t); + if (r < 0) + return r; + + k = service_type_from_string(t); + if (k < 0) + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid service type %s", t); + + if (mode != UNIT_CHECK) { + s->type = k; + unit_write_drop_in_private_format(UNIT(s), mode, name, "Type=%s\n", service_type_to_string(s->type)); + } + + return 1; + } else if (streq(name, "ExecStart")) { unsigned n = 0; @@ -151,6 +170,7 @@ static int bus_service_set_transient_property( n++; } + if (r < 0) return r; @@ -223,6 +243,10 @@ int bus_service_set_property( if (r != 0) return r; + r = bus_exec_context_set_transient_property(u, &s->exec_context, name, message, mode, error); + if (r != 0) + return r; + r = bus_kill_context_set_transient_property(u, &s->kill_context, name, message, mode, error); if (r != 0) return r; @@ -234,6 +258,8 @@ int bus_service_set_property( int bus_service_commit_properties(Unit *u) { assert(u); + unit_update_cgroup_members_masks(u); unit_realize_cgroup(u); + return 0; }