summaryrefslogtreecommitdiff
path: root/src/run
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@googlemail.com>2015-09-02 11:14:41 +0200
committerDavid Herrmann <dh.herrmann@googlemail.com>2015-09-02 11:14:41 +0200
commitd18ec0491ed7c502080c03fa5fe93c8b6ac3d6ea (patch)
tree3613b205544d081eaa76656c117034754531ce73 /src/run
parentf22572452b55f78ec9cddfdb0229c1d93dd9ce67 (diff)
parent751090cc8ae09787402d60b7080d479b3afe3b13 (diff)
Merge pull request #1112 from poettering/sd-bus-container-fixes
machined and sd-bus container fixes
Diffstat (limited to 'src/run')
-rw-r--r--src/run/run.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/run/run.c b/src/run/run.c
index a69560208c..657c6fcaf1 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -702,6 +702,9 @@ static int start_transient_service(
if (r < 0)
return log_error_errno(r, "Failed to determine tty name: %m");
+ if (unlockpt(master) < 0)
+ return log_error_errno(errno, "Failed to unlock tty: %m");
+
} else if (arg_transport == BUS_TRANSPORT_MACHINE) {
_cleanup_bus_unref_ sd_bus *system_bus = NULL;
const char *s;
@@ -738,9 +741,6 @@ static int start_transient_service(
return log_oom();
} else
assert_not_reached("Can't allocate tty via ssh");
-
- if (unlockpt(master) < 0)
- return log_error_errno(errno, "Failed to unlock tty: %m");
}
if (!arg_no_block) {