if (m->in_gc_queue)
LIST_REMOVE(gc_queue, m->manager->machine_gc_queue, m);
- if (m->scope) {
- hashmap_remove(m->manager->machine_units, m->scope);
- free(m->scope);
+ if (m->unit) {
+ hashmap_remove(m->manager->machine_units, m->unit);
+ free(m->unit);
}
free(m->scope_job);
"NAME=%s\n",
m->name);
- if (m->scope)
- fprintf(f, "SCOPE=%s\n", m->scope);
+ if (m->unit) {
+ _cleanup_free_ char *escaped;
+
+ escaped = cescape(m->unit);
+ if (!escaped) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ fprintf(f, "SCOPE=%s\n", escaped); /* We continue to call this "SCOPE=" because it is internal only, and we want to stay compatible with old files */
+ }
if (m->scope_job)
fprintf(f, "SCOPE_JOB=%s\n", m->scope_job);
- if (m->service)
- fprintf(f, "SERVICE=%s\n", m->service);
+ if (m->service) {
+ _cleanup_free_ char *escaped;
+
+ escaped = cescape(m->service);
+ if (!escaped) {
+ r = -ENOMEM;
+ goto finish;
+ }
+ fprintf(f, "SERVICE=%s\n", escaped);
+ }
- if (m->root_directory)
- fprintf(f, "ROOT=%s\n", m->root_directory);
+ if (m->root_directory) {
+ _cleanup_free_ char *escaped;
+
+ escaped = cescape(m->root_directory);
+ if (!escaped) {
+ r = -ENOMEM;
+ goto finish;
+ }
+ fprintf(f, "ROOT=%s\n", escaped);
+ }
if (!sd_id128_equal(m->id, SD_ID128_NULL))
fprintf(f, "ID=" SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(m->id));
unlink(temp_path);
}
+ if (m->unit) {
+ char *sl;
+
+ /* Create a symlink from the unit name to the machine
+ * name, so that we can quickly find the machine for
+ * each given unit */
+ sl = strappenda("/run/systemd/machines/unit:", m->unit);
+ symlink(m->name, sl);
+ }
+
finish:
if (r < 0)
log_error("Failed to save machine data %s: %s", m->state_file, strerror(-r));
return r;
}
+static void machine_unlink(Machine *m) {
+ assert(m);
+
+ if (m->unit) {
+
+ char *sl;
+
+ sl = strappenda("/run/systemd/machines/unit:", m->unit);
+ unlink(sl);
+ }
+
+ if (m->state_file)
+ unlink(m->state_file);
+}
+
int machine_load(Machine *m) {
_cleanup_free_ char *realtime = NULL, *monotonic = NULL, *id = NULL, *leader = NULL, *class = NULL;
int r;
assert(m);
r = parse_env_file(m->state_file, NEWLINE,
- "SCOPE", &m->scope,
+ "SCOPE", &m->unit,
"SCOPE_JOB", &m->scope_job,
"SERVICE", &m->service,
"ROOT", &m->root_directory,
assert(m);
- if (!m->scope) {
+ if (!m->unit) {
_cleanup_free_ char *escaped = NULL;
- char *scope, *description, *job;
+ char *scope, *description, *job = NULL;
escaped = unit_name_escape(m->name);
if (!escaped)
free(scope);
return r;
} else {
- m->scope = scope;
+ m->unit = scope;
free(m->scope_job);
m->scope_job = job;
}
}
- if (m->scope)
- hashmap_put(m->manager->machine_units, m->scope, m);
+ if (m->unit)
+ hashmap_put(m->manager->machine_units, m->unit, m);
return r;
}
log_struct(LOG_INFO,
MESSAGE_ID(SD_MESSAGE_MACHINE_START),
"NAME=%s", m->name,
- "LEADER=%lu", (unsigned long) m->leader,
+ "LEADER="PID_FMT, m->leader,
"MESSAGE=New machine %s.", m->name,
NULL);
static int machine_stop_scope(Machine *m) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- char *job;
+ char *job = NULL;
int r;
assert(m);
- if (!m->scope)
+ if (!m->unit)
return 0;
- r = manager_stop_unit(m->manager, m->scope, &error, &job);
+ r = manager_stop_unit(m->manager, m->unit, &error, &job);
if (r < 0) {
log_error("Failed to stop machine scope: %s", bus_error_message(&error, r));
return r;
log_struct(LOG_INFO,
MESSAGE_ID(SD_MESSAGE_MACHINE_STOP),
"NAME=%s", m->name,
- "LEADER=%lu", (unsigned long) m->leader,
+ "LEADER="PID_FMT, m->leader,
"MESSAGE=Machine %s terminated.", m->name,
NULL);
if (k < 0)
r = k;
- unlink(m->state_file);
+ machine_unlink(m);
machine_add_to_gc_queue(m);
if (m->started)
if (m->scope_job && manager_job_is_active(m->manager, m->scope_job))
return true;
- if (m->scope && manager_unit_is_active(m->manager, m->scope))
+ if (m->unit && manager_unit_is_active(m->manager, m->unit))
return true;
return false;
int machine_kill(Machine *m, KillWho who, int signo) {
assert(m);
- if (!m->scope)
+ if (!m->unit)
return -ESRCH;
- return manager_kill_unit(m->manager, m->scope, who, signo, NULL);
+ if (who == KILL_LEADER) {
+ /* If we shall simply kill the leader, do so directly */
+
+ if (kill(m->leader, signo) < 0)
+ return -errno;
+ }
+
+ /* Otherwise make PID 1 do it for us, for the entire cgroup */
+ return manager_kill_unit(m->manager, m->unit, signo, NULL);
}
static const char* const machine_class_table[_MACHINE_CLASS_MAX] = {