From 2dc27d4b6c641e18b8cf3288b5235bd430533794 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 9 Oct 2013 19:54:58 +0300 Subject: [PATCH] xorg: fix configure on multi-gpu setups. no more than one xorg-configure@ should be allowed. so pick the first card this hardly depends on current xorg udev rules (see commit a4b62c0017) or on all drm drivers built as modules. --- .../x11/xserver/xorg-server/scripts/xorg-configure | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/x11/xserver/xorg-server/scripts/xorg-configure b/packages/x11/xserver/xorg-server/scripts/xorg-configure index 8d6796ad0b..a0b000e487 100755 --- a/packages/x11/xserver/xorg-server/scripts/xorg-configure +++ b/packages/x11/xserver/xorg-server/scripts/xorg-configure @@ -24,10 +24,17 @@ # creating needed directories and symlinks ################################################################################ -logger -t Xorg "creating needed directories and symlinks for driver: "$1"" +mkdir -p /var/lib +mkdir -p /var/run - mkdir -p /var/lib - mkdir -p /var/run +# HACK. we have xorg-configure@%. so nice race +# can happen on multi-gpu setups +if [ -e /var/run/xorg-configure.done ] ; then + exit 0 +fi + +touch /var/run/xorg-configure.done +logger -t Xorg "creating needed directories and symlinks for driver: "$1"" ############################################################################## # setup xorg.conf paths