diff options
author | Hans de Goede <hdegoede@redhat.com> | 2015-01-20 16:18:34 +0100 |
---|---|---|
committer | Hans de Goede <hdegoede@redhat.com> | 2015-01-23 11:58:26 +0100 |
commit | bd6cacdd36615e9b8136aeb86c3924a404785977 (patch) | |
tree | 5832d236bd14ff7741e845cdac368244b83fb037 /startx.cpp | |
parent | 6f6747d500439782476cf5c029a7fc45fc954c86 (diff) |
startx: Pass -keeptty when telling the server to start on the current tty
Detaching from the tty causes systemd-logind to refuse service to the xserver,
the xserver already tries to detect that it is being asked to run on the
current tty and then automatically enables -keeptty, but this code fails if
all of stdin, stdout and stderr are redirected to a file. So explicitly tell
the xserver to not detach when we're telling it to run on the current tty.
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1177513
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'startx.cpp')
-rw-r--r-- | startx.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -195,7 +195,7 @@ if [ x"$server" = x ]; then tty=$(tty) if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then tty_num=$(echo "$tty" | grep -oE '[0-9]+$') - vtarg="vt$tty_num" + vtarg="vt$tty_num -keeptty" fi #endif |