--- xinit-1.3.4/startx.cpp.orig 2014-12-19 14:35:43.000000000 +0900 +++ xinit-1.3.4/startx.cpp 2014-12-23 18:41:18.000000000 +0900 @@ -60,7 +60,6 @@ defaultdisplay=":0" clientargs="" serverargs="" -vtarg="" #ifdef __APPLE__ @@ -189,17 +188,6 @@ if [ x"$server" = x ]; then server=$defaultserver -#ifdef __linux__ - XCOMM When starting the defaultserver start X on the current tty to avoid - XCOMM the startx session being seen as inactive: - XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491" - 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" - fi -#endif - XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments if [ x"$serverargs" = x -a x"$display" = x ]; then if [ -f "$userserverrc" ]; then @@ -215,17 +203,6 @@ serverargs=$defaultserverargs fi -XCOMM if no vt is specified add vtarg (which may be empty) -have_vtarg="no" -for i in $serverargs; do - if expr match "$i" '^vt[0-9]\+$' > /dev/null; then - have_vtarg="yes" - fi -done -if [ "$have_vtarg" = "no" ]; then - serverargs="$serverargs $vtarg" -fi - XCOMM if no display, use default if [ x"$display" = x ]; then display=$defaultdisplay