From e0d508671fc69c3507f1a77a2e399542ab2639a5 Mon Sep 17 00:00:00 2001
From: Simon Fels <morphis@gravedo.de>
Date: Sun, 1 Jul 2018 17:55:40 +0200
Subject: [PATCH] scripts: set explicit search path for libboost_log

---
 scripts/container-manager.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/scripts/container-manager.sh b/scripts/container-manager.sh
index 7e7fb15..9a8ffb4 100755
--- a/scripts/container-manager.sh
+++ b/scripts/container-manager.sh
@@ -15,6 +15,14 @@ if [ ! -e $ANDROID_IMG ]; then
 	exit 1
 fi
 
+if [ "$SNAP_ARCH" == "amd64" ]; then
+	ARCH="x86_64-linux-gnu"
+elif [ "$SNAP_ARCH" == "armhf" ]; then
+	ARCH="arm-linux-gnueabihf"
+else
+	ARCH="$SNAP_ARCH-linux-gnu"
+fi
+
 start() {
 	# Make sure our setup path for the container rootfs
 	# is present as lxc is statically configured for
@@ -36,7 +44,12 @@ start() {
 	fi
 
 	# liblxc.so.1 is in $SNAP/lib
-	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/lib
+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/liblxc
+
+	# For unknown reason we got bug reports that the container manager failed to start
+	# because it cannot find libboost_log.so.1.58.0 To mitigate this we're adding the
+	# lib directory as explicit search target here.
+	export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/$ARCH
 
 	if [ -d /sys/kernel/security/apparmor ] ; then
 		# Load the profile for our Android container