shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-25 23:21:33 +03:00
Code

unit: refuse merging if the unit in question has a job assigned or suchlike

Browse Source
This commit is contained in:
Lennart Poettering 2010-04-10 04:42:36 +02:00
parent 8b6c71206d
commit 819e213fbf
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
unit.c
View File

@ -219,6 +219,7 @@ int unit_set_description(Unit *u, const char *description) {
void unit_add_to_load_queue(Unit *u) {
assert(u);
assert(u->meta.type != _UNIT_TYPE_INVALID);
if (u->meta.load_state != UNIT_STUB || u->meta.in_load_queue)
return;
@ -239,6 +240,7 @@ void unit_add_to_cleanup_queue(Unit *u) {
void unit_add_to_dbus_queue(Unit *u) {
assert(u);
assert(u->meta.type != _UNIT_TYPE_INVALID);
if (u->meta.load_state == UNIT_STUB || u->meta.in_dbus_queue || set_isempty(u->meta.manager->subscribed))
return;
@ -409,6 +411,12 @@ int unit_merge(Unit *u, Unit *other) {
other->meta.load_state != UNIT_FAILED)
return -EEXIST;
if (other->meta.job)
return -EEXIST;
if (unit_active_state(other) != UNIT_INACTIVE)
return -EEXIST;
/* Merge names */
merge_names(u, other);