Fixed two minor bugs (sb2,sb2-init) Both bugs only show up when target architecture == host architecture: - suppress a message about missing ld.so.conf.d (causes no harm if it doesn't exists, but the message was unconfortable) - sb2-init used "which" to guess what qemu should be used if cpu transparency method was not set by an option. This fix removes that logic completely because it caused too much trouble: For example, some x86 hosts seem to have /usr/bin/qemu-i386, which must not be used as cpu transparency method..otherwise target binaries can not be executed at all.

2 files changed, 8 insertions, 8 deletions

diff --git a/utils/sb2 b/utils/sb2
index 77b3453..f9057fb 100755
--- a/utils/sb2
+++ b/utils/sb2
@@ -256,12 +256,16 @@ function write_ld_library_path_replacement_to_exec_config()
 	# First, make sure that libsb2 is searched
 	liblocations="$SBOX_DIR/lib/libsb2 /usr/lib/libsb2"
 
-	# Include the directories listed in ld.so.conf
+	# Include directories listed in ld.so.conf
 	if [ -f $rootdir/etc/ld.so.conf ]
 	then
-		lloc2=`cat $rootdir/etc/ld.so.conf \
-			$rootdir/etc/ld.so.conf.d/* |
-			egrep '^/'`
+		lloc2=`egrep '^/' $rootdir/etc/ld.so.conf`
+		liblocations="$liblocations $lloc2"
+	fi
+	# Include directories listed in ld.so.conf.d/*
+	if [ -d $rootdir/etc/ld.so.conf.d ]
+	then
+		lloc2=`cat $rootdir/etc/ld.so.conf.d/* 2>/dev/null | egrep '^/'`
 		liblocations="$liblocations $lloc2"
 	fi
 
diff --git a/utils/sb2-init b/utils/sb2-init
index 21d8dde..1cf5533 100755
--- a/utils/sb2-init
+++ b/utils/sb2-init
@@ -290,11 +290,7 @@ else
 	fi
 fi
 
-
 DEBIAN_CPU=$ARCH
-if [ -z "$CPUTRANSP" ]; then
-	CPUTRANSP="$(which qemu-$ARCH)"
-fi
 
 HOST_ARCH="$(uname --machine)"
 if echo "$HOST_ARCH" | grep -q "^i.86*"; then