From f1f3812aa6b0858284f1ee4a413cbdaf92c13a6b Mon Sep 17 00:00:00 2001
From: Andrey Arapov <andrey.arapov@nixaid.com>
Date: Sat, 6 Aug 2016 18:20:55 +0200
Subject: [PATCH] fixes

---
 docker-compose.yml | 28 ++++++++++++++--------------
 launch             | 11 ++++++++++-
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 860426f..4b8a459 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,21 +16,21 @@ services:
       - data:/home
       # - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket:ro
       # Ubuntu's NVIDIA driver:
-      - /usr/lib/nvidia-361-prime:/h1:ro
-      - /usr/lib/nvidia-340:/h2:ro
-      - /usr/lib/nvidia-340-prime:/h3:ro
-      - /usr/lib/nvidia-304:/h4:ro
-      - /usr/lib32/nvidia-361:/h5:ro
-      - /usr/lib32/nvidia-340:/h6:ro
-      - /usr/lib32/nvidia-304:/h7:ro
-      # openSUSE's NVIDIA driver:
-      - /usr/X11R6/lib:/h10:ro
-      - /usr/X11R6/lib64:/h11:ro
-      - /usr/lib:/h12:ro
-      - /usr/lib64:/h13:ro
+      - /usr/lib/nvidia-361-prime:/h1_64:ro
+      - /usr/lib/nvidia-340:/h2_64:ro
+      - /usr/lib/nvidia-340-prime:/h3_64:ro
+      - /usr/lib/nvidia-304:/h4_64:ro
+      - /usr/lib32/nvidia-361:/h5_32:ro
+      - /usr/lib32/nvidia-340:/h6_32:ro
+      - /usr/lib32/nvidia-304:/h7_32:ro
       # Ubuntu's generic libGL:
-      - /usr/lib/x86_64-linux-gnu:/h8:ro
-      - /usr/lib/i386-linux-gnu:/h9:ro
+      - /usr/lib/x86_64-linux-gnu:/h8_64:ro
+      - /usr/lib/i386-linux-gnu:/h9_32:ro
+      # openSUSE's NVIDIA driver:
+      - /usr/X11R6/lib:/h10_32:ro
+      - /usr/X11R6/lib64:/h11_64:ro
+      - /usr/lib:/h12_32:ro
+      - /usr/lib64:/h13_64:ro
     devices:
       - /dev/nvidia0
       - /dev/nvidiactl
diff --git a/launch b/launch
index d222d54..0b662b7 100644
--- a/launch
+++ b/launch
@@ -44,6 +44,15 @@ fi
 #
 # Make sure the Steam docker image's paths are coming first
 # and then the hosts's (/h1..20) mounted ones
-export LD_LIBRARY_PATH="/usr/lib:/lib/i386-linux-gnu:/lib/x86_64-linux-gnu:$(echo /h{1..20} | tr ' ' ':')"
+export LD_LIBRARY_PATH="/lib:/lib64:/lib/i386-linux-gnu:/lib/x86_64-linux-gnu:$(echo /h{1..20}_{32,64} | tr ' ' ':')"
+# GOOD export LD_LIBRARY_PATH="/lib/i386-linux-gnu:/lib/x86_64-linux-gnu:$(echo /h{1..20}_{32,64} | tr ' ' ':')"
+
+#
+# In order to avoid the inconsistency error, when launching `csgo_linux64`
+# Inconsistency detected by ld.so: dl-open.c: 689: _dl_open: Assertion `_dl_debug_initialize (0, args.nsid)->r_state == RT_CONSISTENT' failed!
+# Hint: to find out what's wrong, use `strace`
+#
+# 1) openSUSE's libpulsecommon-7.0.so vs Ubuntu's libpulsecommon-5.0.so
+export LD_PRELOAD=$(find /h{1..20}_{32,64} -name "*libpulsecommon*" 2>/dev/null)
 
 su -p user -c "steam $@"