summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-01-22 17:30:58 +0100
committerLennart Poettering <lennart@poettering.net>2015-01-22 17:50:50 +0100
commit813c65c34beae2eed1f93d9317f97d7e806389f5 (patch)
tree6a101146eeff7cf13e0bd435ca685c426ea7c92b
parent6e18cc9fa078d2a967251017ddb5baefb104b720 (diff)
machinectl: minor simplification
-rw-r--r--src/machine/machinectl.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index ec403e8f33..8e2780e9c8 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -1355,7 +1355,6 @@ static int login_machine(int argc, char *argv[], void *userdata) {
int master = -1, r, ret = 0;
sd_bus *bus = userdata;
const char *pty, *match;
- sigset_t mask;
char last_char = 0;
bool machine_died;
@@ -1417,9 +1416,7 @@ static int login_machine(int argc, char *argv[], void *userdata) {
if (r < 0)
return bus_log_parse_error(r);
- assert_se(sigemptyset(&mask) == 0);
- sigset_add_many(&mask, SIGWINCH, SIGTERM, SIGINT, -1);
- assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
+ sigprocmask_many(SIG_BLOCK, SIGWINCH, SIGTERM, SIGINT, -1);
log_info("Connected to machine %s. Press ^] three times within 1s to exit session.", argv[1]);