From 2b3177ca490a4353bbed0ca2d8e32079e92a646c Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 29 Jan 2009 17:57:45 +0000
Subject: - XFdrake:   o use option -noAutoAddDevices when testing X    
 (useful during installation, #47237)

nb: this works if x11-server has patch Add-noAutoAddDevices-command-line-option.patch
---
 NEWS                | 4 ++++
 lib/Xconfig/test.pm | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 3139324..3e97158 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- XFdrake:
+  o use option -noAutoAddDevices when testing X
+    (useful during installation, #47237)
+
 Version 0.68 - 28 January 2008
 
 - keyboarddrake:
diff --git a/lib/Xconfig/test.pm b/lib/Xconfig/test.pm
index a8ce68a..1fd15fb 100644
--- a/lib/Xconfig/test.pm
+++ b/lib/Xconfig/test.pm
@@ -53,7 +53,7 @@ sub test {
 	system("xauth add :9 . `mcookie`");
 	open STDERR, ">$f_err";
 	chroot $::prefix if $::prefix;
-	exec 'Xorg', '-xf86config', $f, ":9" or c::_exit(0);
+	exec 'Xorg', '-noAutoAddDevices', '-xf86config', $f, ":9" or c::_exit(0);
     }
 
     do { sleep 1 } until xtest(":9") || waitpid($pid, c::WNOHANG());
-- 
cgit v1.2.1