SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logind: after deserializatio readd systemd units to unit-to-object hashmap correctly

Browse Source
This commit is contained in:
Lennart Poettering
2013-07-02 17:18:41 +02:00
parent 8b6fe8243d
commit d0af76e68a
3 changed files with 74 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/machine/machine.c
+20 -18
View File
@@ -228,33 +228,35 @@ static int machine_start_scope(Machine *m) {
dbus_error_init(&error);
if (!m->scope) {
char *escaped = NULL;
_cleanup_free_ char *escaped = NULL;
char *scope;
escaped = unit_name_escape(m->name);
if (!escaped)
return log_oom();
m->scope = strjoin("machine-", escaped, ".scope", NULL);
free(escaped);
if (!m->scope)
scope = strjoin("machine-", escaped, ".scope", NULL);
if (scope)
return log_oom();
r = hashmap_put(m->manager->machine_units, m->scope, m);
if (r < 0)
log_warning("Failed to create mapping between unit and machine");
description = strappend(m->class == MACHINE_VM ? "Virtual Machine " : "Container ", m->name);
r = manager_start_scope(m->manager, m->scope, m->leader, SPECIAL_MACHINE_SLICE, description, &error, &job);
if (r < 0) {
log_error("Failed to start machine scope: %s", bus_error(&error, r));
dbus_error_free(&error);
free(scope);
} else {
m->scope = scope;
free(m->scope_job);
m->scope_job = job;
}
}
description = strappend(m->class == MACHINE_VM ? "Virtual Machine " : "Container ", m->name);
r = manager_start_scope(m->manager, m->scope, m->leader, SPECIAL_MACHINE_SLICE, description, &error, &job);
if (r < 0) {
log_error("Failed to start machine scope: %s", bus_error(&error, r));
dbus_error_free(&error);
} else {
free(m->scope_job);
m->scope_job = job;
}
if (m->scope)
hashmap_put(m->manager->machine_units, m->scope, m);
return r;
}