summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/busname.c6
-rw-r--r--src/tty-ask-password-agent/tty-ask-password-agent.c2
-rw-r--r--units/user/exit.target3
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