diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-06-15 20:35:18 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-06-15 20:35:18 +0200 |
| commit | 86b85cf440324c4be2d49472e40dbb6ec0faa330 (patch) | |
| tree | d3f0da63487dd124e490aef54aa710dbab6032dc /src/machine | |
| parent | 78ed65ac8dd05041f08ba8b089e1e87445a0905f (diff) | |
| parent | 72c0a2c255b172ebbb2a2b7dab7c9aec4c9582d9 (diff) | |
Merge pull request #214 from poettering/signal-rework-2
everywhere: port everything to sigprocmask_many() and friends
Diffstat (limited to 'src/machine')
| -rw-r--r-- | src/machine/machinectl.c | 4 | ||||
| -rw-r--r-- | src/machine/machined.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 719eb10932..7938aa4dbe 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -1219,7 +1219,7 @@ static int login_machine(int argc, char *argv[], void *userdata) { if (r < 0) return bus_log_parse_error(r); - sigprocmask_many(SIG_BLOCK, SIGWINCH, SIGTERM, SIGINT, -1); + assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGWINCH, SIGTERM, SIGINT, -1) >= 0); log_info("Connected to machine %s. Press ^] three times within 1s to exit session.", argv[1]); @@ -1630,7 +1630,7 @@ static int transfer_image_common(sd_bus *bus, sd_bus_message *m) { if (r < 0) return bus_log_parse_error(r); - sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1); + assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1) >= 0); if (!arg_quiet) log_info("Enqueued transfer job %u. Press C-c to continue download in background.", id); diff --git a/src/machine/machined.c b/src/machine/machined.c index 754c770040..9bfe2add54 100644 --- a/src/machine/machined.c +++ b/src/machine/machined.c @@ -322,7 +322,7 @@ int main(int argc, char *argv[]) { * check stays in. */ mkdir_label("/run/systemd/machines", 0755); - assert_se(sigprocmask_many(SIG_BLOCK, SIGCHLD, -1) >= 0); + assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGCHLD, -1) >= 0); m = manager_new(); if (!m) { |