From: Franck Bui <fbui@suse.com>
Date: Wed, 2 Nov 2016 15:24:57 +0000 (+0100)
Subject: core: monitor the inotify file descriptor not the console one in acquire_terminal()
X-Git-Tag: v233~411^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f80da6f3e9913cec4febcf35536b6b98cfa9d33a;p=thirdparty%2Fsystemd.git

core: monitor the inotify file descriptor not the console one in acquire_terminal()

When waiting for the terminal to be release in acquire_terminal(), we
were monitoring the terminal fd instead of the inotify descriptor.

Therefore any write accesses would wake up the waiting process instead
of being wake up when the tty is closed only.
---

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index eafdea9eb35..4b04ccc2460 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -455,7 +455,7 @@ int acquire_terminal(
                                         goto fail;
                                 }
 
-                                r = fd_wait_for_event(fd, POLLIN, ts + timeout - n);
+                                r = fd_wait_for_event(notify, POLLIN, ts + timeout - n);
                                 if (r < 0)
                                         goto fail;