1 files changed, 11 insertions, 3 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 44eed4dc9..517d37303 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -585,7 +585,8 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
     if (xf86DoShowOptions)
         DoShowOptions();
 
-    xf86OpenConsole();
+    if (0 && !xorgWayland)
+        xf86OpenConsole();
 
     /* Do a general bus probe.  This will be a PCI probe for x86 platforms */
     xf86BusProbe();
@@ -950,7 +951,8 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
     /*
      * serverGeneration != 1; some OSs have to do things here, too.
      */
-    xf86OpenConsole();
+    if (0 && !xorgWayland)	  
+      xf86OpenConsole();
 
 #ifdef XF86PM
     /*
@@ -1182,7 +1184,8 @@ ddxGiveUp(void)
     DGAShutdown();
 #endif
 
-    xf86CloseConsole();
+    if (0 && !xorgWayland)
+        xf86CloseConsole();
 
     xf86CloseLog();
 
@@ -1609,6 +1612,11 @@ ddxProcessArgument(int argc, char **argv, int i)
     return 0;
   }
 
+  if (!strcmp(argv[i], "-wayland"))
+  {
+    xorgWayland = TRUE;
+    return 1;
+  }
   /* OS-specific processing */
   return xf86ProcessArgument(argc, argv, i);
 }