summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2009-01-29 17:57:45 +0000
committerPascal Rigaux <pixel@mandriva.com>2009-01-29 17:57:45 +0000
commit2b3177ca490a4353bbed0ca2d8e32079e92a646c (patch)
tree7e86730141b69ac1f24850ba36c9037dba3190eb
parent611a0da3d2808bae932e72e74aa3c69bc6745d69 (diff)
downloaddrakx-kbd-mouse-x11-2b3177ca490a4353bbed0ca2d8e32079e92a646c.tar
drakx-kbd-mouse-x11-2b3177ca490a4353bbed0ca2d8e32079e92a646c.tar.gz
drakx-kbd-mouse-x11-2b3177ca490a4353bbed0ca2d8e32079e92a646c.tar.bz2
drakx-kbd-mouse-x11-2b3177ca490a4353bbed0ca2d8e32079e92a646c.tar.xz
drakx-kbd-mouse-x11-2b3177ca490a4353bbed0ca2d8e32079e92a646c.zip
- 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
-rw-r--r--NEWS4
-rw-r--r--lib/Xconfig/test.pm2
2 files changed, 5 insertions, 1 deletions
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());