---
src/machine/machine-dbus.c | 18 +++++++++---------
src/nspawn/nspawn.c | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 0892479..12f7961 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -327,9 +327,9 @@ int bus_machine_method_get_addresses(sd_bus_message
*message, void *userdata, sd
r = wait_for_terminate(child, &si);
if (r < 0)
- return sd_bus_error_set_errnof(error, r, "Failed to wait for
client: %m");
+ return sd_bus_error_set_errnof(error, r, "Failed to wait for
child: %m");
if (si.si_code != CLD_EXITED || si.si_status != EXIT_SUCCESS)
- return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Client
died abnormally.");
+ return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Child
died abnormally.");
r = sd_bus_message_close_container(reply);
if (r < 0)
@@ -404,9 +404,9 @@ int bus_machine_method_get_os_release(sd_bus_message
*message, void *userdata, s
r = wait_for_terminate(child, &si);
if (r < 0)
- return sd_bus_error_set_errnof(error, r, "Failed to wait for
client: %m");
+ return sd_bus_error_set_errnof(error, r, "Failed to wait for
child: %m");
if (si.si_code != CLD_EXITED || si.si_status != EXIT_SUCCESS)
- return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Client
died abnormally.");
+ return sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Child
died abnormally.");
r = sd_bus_message_new_method_return(message, &reply);
if (r < 0)
@@ -738,11 +738,11 @@ int bus_machine_method_bind_mount(sd_bus_message
*message, void *userdata, sd_bu
r = wait_for_terminate(child, &si);
if (r < 0) {
- r = sd_bus_error_set_errnof(error, r, "Failed to wait for
client: %m");
+ r = sd_bus_error_set_errnof(error, r, "Failed to wait for
child: %m");
goto finish;
}
if (si.si_code != CLD_EXITED) {
- r = sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Client died
abnormally.");
+ r = sd_bus_error_setf(error, SD_BUS_ERROR_FAILED, "Child died
abnormally.");
goto finish;
}
if (si.si_status != EXIT_SUCCESS) {
@@ -750,7 +750,7 @@ int bus_machine_method_bind_mount(sd_bus_message *message,
void *userdata, sd_bu
if (read(errno_pipe_fd[0], &r, sizeof(r)) == sizeof(r))
r = sd_bus_error_set_errnof(error, r, "Failed to
mount: %m");
else
- r = sd_bus_error_setf(error, SD_BUS_ERROR_FAILED,
"Client failed.");
+ r = sd_bus_error_setf(error, SD_BUS_ERROR_FAILED,
"Child failed.");
goto finish;
}
@@ -786,7 +786,7 @@ static int machine_operation_done(sd_event_source *s, const
siginfo_t *si, void
o->pid = 0;
if (si->si_code != CLD_EXITED) {
- r = sd_bus_error_setf(&error, SD_BUS_ERROR_FAILED, "Client
died abnormally.");
+ r = sd_bus_error_setf(&error, SD_BUS_ERROR_FAILED, "Child died
abnormally.");
goto fail;
}
@@ -794,7 +794,7 @@ static int machine_operation_done(sd_event_source *s, const
siginfo_t *si, void
if (read(o->errno_fd, &r, sizeof(r)) == sizeof(r))
r = sd_bus_error_set_errnof(&error, r, "%m");
else
- r = sd_bus_error_setf(&error, SD_BUS_ERROR_FAILED,
"Client failed.");
+ r = sd_bus_error_setf(&error, SD_BUS_ERROR_FAILED,
"Child failed.");
goto fail;
}
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 28b79c4..2b397b6 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -4806,8 +4806,8 @@ int main(int argc, char *argv[]) {
}
/* Let the child know that we are ready and wait that the
child is completely ready now. */
- if (!barrier_place_and_sync(&barrier)) { /* #5 */
- log_error("Client died too early.");
+ if (!barrier_place_and_sync(&barrier)) { /* #4 */
+ log_error("Child died too early.");
r = -ESRCH;
goto finish;
}
--
2.1.0
_______________________________________________
systemd-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
