diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-06-30 21:30:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-30 21:30:35 +0200 |
| commit | f15461b2b234c178ecbbc18defaef0032a9b3431 (patch) | |
| tree | 81faab6f15ff44393c55484d216fd2e80b993bbf /src/machine/machine-dbus.c | |
| parent | 17c22746b176f2e544d33bdaf30b282ce2c88933 (diff) | |
| parent | 1c6c037cece7add31e4017ea7775ddb32d4fe7ec (diff) | |
Merge pull request #3596 from poettering/machine-clean
make "machinectl clean" asynchronous, and open it up via PolicyKit
Diffstat (limited to 'src/machine/machine-dbus.c')
| -rw-r--r-- | src/machine/machine-dbus.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index de5d98f23e..ba7ac04b56 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -1200,8 +1200,6 @@ int bus_machine_method_copy(sd_bus_message *message, void *userdata, sd_bus_erro child_fail: (void) write(errno_pipe_fd[1], &r, sizeof(r)); - errno_pipe_fd[1] = safe_close(errno_pipe_fd[1]); - _exit(EXIT_FAILURE); } @@ -1209,7 +1207,7 @@ int bus_machine_method_copy(sd_bus_message *message, void *userdata, sd_bus_erro /* Copying might take a while, hence install a watch on the child, and return */ - r = operation_new(m->manager, m, child, message, errno_pipe_fd[0]); + r = operation_new(m->manager, m, child, message, errno_pipe_fd[0], NULL); if (r < 0) { (void) sigkill_wait(child); return r; |