xinit: Changes to 'master'

[Alan Coopersmith]

 xinit.c |   26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

New commits:
commit 09ab37f816d2fe9482574c825132d9b516b8e0bf
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Jul 18 22:58:10 2013 -0700

    Declare processTimeout() as taking a const string arg
    
    Fixes gcc const warnings on every call to it
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 1dd71b4eae433896e41f8366f23b8269712b4cf3
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Jul 18 22:51:56 2013 -0700

    If we have to forcibly kill the Xserver on Solaris, reset kbd_mode
    
    If the Xserver hangs when xinit is waiting for it to die, and xinit
    sends a kill -9 to it, then it will leave the keyboard in a state that
    can't be used on the text console, so fix it up ourselves.
    
    Upstreaming from Solaris, where it was originally implemented to fix
    Sun bug 4221128 “If Xserver is slow to exit, xinit does "kill -9" and
    kbd_mode -a is required”
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>