xinit: Changes to 'master'

[Hans de Goede]

 startx.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bd6cacdd36615e9b8136aeb86c3924a404785977
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Jan 20 16:18:34 2015 +0100

    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 at redhat.com>
    Acked-by: Peter Hutterer <peter.hutterer at who-t.net>