shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 02:57:16 +03:00
Code

Merge pull request #1563 from poettering/exciting-fixes

Browse Source 
A variety of fixes
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-10-14 11:22:14 -04:00
commit 340a1d6fea
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/busname.c
View File

@ -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;

2
src/tty-ask-password-agent/tty-ask-password-agent.c
View File

@ -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;
}

3
units/user/exit.target
View File

@ -12,6 +12,3 @@ DefaultDependencies=no
Requires=systemd-exit.service
After=systemd-exit.service
AllowIsolate=yes
[Install]
Alias=ctrl-alt-del.target