Attachment 641054 Details for Bug 806491 – patch v3

[patch] patch v3

display_number_fix_v3.diff (text/plain), 1.09 KB, created by Vsevolod Volkov on 2012-11-08 19:32:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vsevolod Volkov

Created: 2012-11-08 19:32:45 UTC

Size: 1.09 KB

patch

obsolete

>--- startx.v2	2012-11-08 20:31:40.000000000 +0200
>+++ startx	2012-11-08 20:50:33.724867061 +0200
>@@ -30,6 +30,7 @@
> clientargs=""
> serverargs=""
> tty_num=$(tty | grep -oE '[0-9]+$')
>+vt_num=""
> 
> enable_xauth=1
> 
>@@ -77,6 +78,9 @@
> 		display="$1"
> 	    else
> 		serverargs="$serverargs $1"
>+		if expr "$1" : 'vt[0-9][0-9]*$' > /dev/null 2>&1; then
>+		    vt_num="$1"
>+		fi
> 	    fi
> 	fi
> 	;;
>@@ -84,15 +88,6 @@
>     shift
> done
> 
>-if [ x"$tty_num" != x ]; then
>-    # Specify TTY number directly to avoid recognizing startx session as
>-    # inactive: RHBZ#820675
>-    serverargs=${serverargs}" vt"${tty_num}
>-else
>-    echo "Error getting tty num"
>-    exit 1
>-fi
>-
> # process client arguments
> if [ x"$client" = x ]; then
>     client=$defaultclient
>@@ -142,6 +137,12 @@
>     display=$defaultdisplay
> fi
> 
>+if [ x"$tty_num" != x -a x"$vt_num" = x ]; then
>+    # Specify TTY number directly to avoid recognizing startx session as
>+    # inactive: RHBZ#820675
>+    serverargs="${serverargs} vt${tty_num}"
>+fi
>+
> if [ x"$enable_xauth" = x1 ] ; then
>     if [ x"$XAUTHORITY" = x ]; then
>         XAUTHORITY=$HOME/.Xauthority

Actions: View | Diff

Attachments on bug 806491: 592704 | 608214 | 640245 | 641054 | 829657 | 935079