diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-10-14 11:22:14 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-10-14 11:22:14 -0400 |
| commit | 340a1d6feaa67b8cb5c5cfadcc8201925c93c182 (patch) | |
| tree | f382b0f99b9392eed0029cc7bd99b23ac70a1a16 | |
| parent | 9ea79b459edef51e3ccc1ddde07c7b1399bed601 (diff) | |
| parent | be3270ebd3634e3e5c489733dc022c91bf45fba7 (diff) | |
Merge pull request #1563 from poettering/exciting-fixes
A variety of fixes
| -rw-r--r-- | src/core/busname.c | 6 | ||||
| -rw-r--r-- | src/tty-ask-password-agent/tty-ask-password-agent.c | 2 | ||||
| -rw-r--r-- | units/user/exit.target | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/core/busname.c b/src/core/busname.c index 38becfc119..b85fce5f8d 100644 --- a/src/core/busname.c +++ b/src/core/busname.c @@ -585,6 +585,12 @@ static void busname_enter_running(BusName *n) { } if (!pending) { + if (!UNIT_ISSET(n->service)) { + log_unit_error(UNIT(n), "Service to activate vanished, refusing activation."); + r = -ENOENT; + goto fail; + } + r = manager_add_job(UNIT(n)->manager, JOB_START, UNIT_DEREF(n->service), JOB_REPLACE, true, &error, NULL); if (r < 0) goto fail; diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c index 93cce186f0..53986babae 100644 --- a/src/tty-ask-password-agent/tty-ask-password-agent.c +++ b/src/tty-ask-password-agent/tty-ask-password-agent.c @@ -381,7 +381,7 @@ static int wall_tty_block(void) { fd = open(p, O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY); if (fd < 0) - return log_error_errno(errno, "Failed to open %s: %m", p); + return log_debug_errno(errno, "Failed to open %s: %m", p); return fd; } diff --git a/units/user/exit.target b/units/user/exit.target index b0ad24c488..e8148b78c7 100644 --- a/units/user/exit.target +++ b/units/user/exit.target @@ -12,6 +12,3 @@ DefaultDependencies=no Requires=systemd-exit.service After=systemd-exit.service AllowIsolate=yes - -[Install] -Alias=ctrl-alt-del.target |