X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fmachine%2Fmachine.c;h=bb2ebd0dbb0c8e594b0751d2d12827886425f6ae;hb=a1230ff972a6a5d945749e5280cd092a2aa827dd;hp=008bbbc3f401dd26e2d288dc03c21c3661f91c82;hpb=c81ebd35f2b1e838fbd16914b60aae2ab7a7ebe3;p=thirdparty%2Fsystemd.git diff --git a/src/machine/machine.c b/src/machine/machine.c index 008bbbc3f40..bb2ebd0dbb0 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -255,7 +255,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, @@ -395,8 +395,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); @@ -458,8 +457,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);