diff options
Diffstat (limited to 'src/machine/machine.c')
| -rw-r--r-- | src/machine/machine.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/src/machine/machine.c b/src/machine/machine.c index 4bacf91d26..b645f614c4 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -1,22 +1,4 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ -/*** - This file is part of systemd. - - Copyright 2011 Lennart Poettering - - systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - systemd is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see <http://www.gnu.org/licenses/>. -***/ #include <errno.h> #include <string.h> @@ -131,7 +113,7 @@ int machine_save(Machine *m) { if (!m->started) return 0; - r = mkdir_safe_label("/run/systemd/machines", 0755, 0, 0, false); + r = mkdir_safe_label("/run/systemd/machines", 0755, 0, 0, MKDIR_WARN_MODE); if (r < 0) goto fail; @@ -249,7 +231,6 @@ static void machine_unlink(Machine *m) { assert(m); if (m->unit) { - char *sl; sl = strjoina("/run/systemd/machines/unit:", m->unit); @@ -269,7 +250,7 @@ int machine_load(Machine *m) { if (!m->state_file) return 0; - r = parse_env_file(m->state_file, NEWLINE, + r = parse_env_file(NULL, m->state_file, NEWLINE, "SCOPE", &m->unit, "SCOPE_JOB", &m->scope_job, "SERVICE", &m->service, @@ -409,8 +390,7 @@ int machine_start(Machine *m, sd_bus_message *properties, sd_bus_error *error) { "MESSAGE_ID=" SD_MESSAGE_MACHINE_START_STR, "NAME=%s", m->name, "LEADER="PID_FMT, m->leader, - LOG_MESSAGE("New machine %s.", m->name), - NULL); + LOG_MESSAGE("New machine %s.", m->name)); if (!dual_timestamp_is_set(&m->timestamp)) dual_timestamp_get(&m->timestamp); @@ -472,8 +452,7 @@ int machine_finalize(Machine *m) { "MESSAGE_ID=" SD_MESSAGE_MACHINE_STOP_STR, "NAME=%s", m->name, "LEADER="PID_FMT, m->leader, - LOG_MESSAGE("Machine %s terminated.", m->name), - NULL); + LOG_MESSAGE("Machine %s terminated.", m->name)); machine_unlink(m); machine_add_to_gc_queue(m); |