Attachment 158265 Details for Bug 246267 – partial fix

partial fix

xorg-novtswitch.patch (text/plain), 1.23 KB, created by jmccann on 2007-06-29 21:09:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jmccann

Created: 2007-06-29 21:09:12 UTC

Size: 1.23 KB

patch

obsolete

>diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
>index 9775180..6ada29f 100644
>--- a/hw/xfree86/os-support/linux/lnx_init.c
>+++ b/hw/xfree86/os-support/linux/lnx_init.c
>@@ -247,13 +247,16 @@ xf86OpenConsole(void)
> 	    /*
> 	     * now get the VT.  This _must_ succeed, or else fail completely.
> 	     */
>-	    if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) < 0)
>-	        FatalError("xf86OpenConsole: VT_ACTIVATE failed: %s\n",
>-		           strerror(errno));
>+	    if (VTSwitch)
>+	    {
>+                if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) < 0)
>+                    FatalError("xf86OpenConsole: VT_ACTIVATE failed: %s\n",
>+                               strerror(errno));
> 
>-	    if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) < 0)
>-	        FatalError("xf86OpenConsole: VT_WAITACTIVE failed: %s\n",
>-			   strerror(errno));
>+                if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno) < 0)
>+                    FatalError("xf86OpenConsole: VT_WAITACTIVE failed: %s\n",
>+                               strerror(errno));
>+	    }
> 
> 	    if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
> 	        FatalError("xf86OpenConsole: VT_GETMODE failed %s\n",

Actions: View

Attachments on bug 246267: 158265