3
0
Fork 0
forked from mirrors/nixpkgs

vlock: fix ENOPATCH

Thanks, @dtzWill.

Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
This commit is contained in:
Lluís Batlle i Rossell 2017-03-04 09:18:56 +01:00
parent da3c0ac19c
commit 1bd3fa6210
No known key found for this signature in database
GPG key ID: 788610659259C371

View file

@ -0,0 +1,22 @@
In systemd I have seen this error, using it as a service:
vlock-start[14567]: vlock-new: could not activate new terminal: Interrupted system call
I think this should fix that.
diff --git a/modules/new.c b/modules/new.c
index e9b15fb..1f692fd 100644
--- a/modules/new.c
+++ b/modules/new.c
@@ -103,7 +103,10 @@ static char *get_console_name(int n)
* file descriptor. */
static int activate_console(int consfd, int vtno)
{
- int c = ioctl(consfd, VT_ACTIVATE, vtno);
+ int c;
+ do {
+ c = ioctl(consfd, VT_ACTIVATE, vtno);
+ } while(c != 0 && errno == EINTR);
return c < 0 ? c : ioctl(consfd, VT_WAITACTIVE, vtno);
}