diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-07-03 01:59:49 -0400 |
---|---|---|
committer | Martin Pitt <martinpitt@users.noreply.github.com> | 2017-07-03 07:59:49 +0200 |
commit | 0a5706d1437d6ff22d8dc8f300186679a0a6b1cd (patch) | |
tree | 7b41449f1185b09ff349b709d9e9b93c851799af /src/nspawn/nspawn-register.c | |
parent | ff434e21f279e9dcce256ca2e0ac2349361a1fe0 (diff) | |
download | systemd-0a5706d1437d6ff22d8dc8f300186679a0a6b1cd.tar.gz |
nspawn: wait for the scope to be created (#6261)
Fixes #6253.
Diffstat (limited to 'src/nspawn/nspawn-register.c')
-rw-r--r-- | src/nspawn/nspawn-register.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/nspawn/nspawn-register.c b/src/nspawn/nspawn-register.c index ffdf1239fa..5b0faf809c 100644 --- a/src/nspawn/nspawn-register.c +++ b/src/nspawn/nspawn-register.c @@ -263,14 +263,20 @@ int allocate_scope( _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL; _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; + _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; + _cleanup_(bus_wait_for_jobs_freep) BusWaitForJobs *w = NULL; _cleanup_free_ char *scope = NULL; - const char *description; + const char *description, *object; int r; r = sd_bus_default_system(&bus); if (r < 0) return log_error_errno(r, "Failed to open system bus: %m"); + r = bus_wait_for_jobs_new(bus, &w); + if (r < 0) + return log_error_errno(r, "Could not watch job: %m"); + r = unit_name_mangle_with_suffix(machine_name, UNIT_NAME_NOGLOB, ".scope", &scope); if (r < 0) return log_error_errno(r, "Failed to mangle scope name: %m"); @@ -329,11 +335,19 @@ int allocate_scope( if (r < 0) return bus_log_create_error(r); - r = sd_bus_call(bus, m, 0, &error, NULL); + r = sd_bus_call(bus, m, 0, &error, &reply); if (r < 0) { log_error("Failed to allocate scope: %s", bus_error_message(&error, r)); return r; } + r = sd_bus_message_read(reply, "o", &object); + if (r < 0) + return bus_log_parse_error(r); + + r = bus_wait_for_jobs_one(w, object, false); + if (r < 0) + return r; + return 0; } |