X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=blobdiff_plain;f=nativebridge%2Fbin%2Fenable_nativebridge;h=70fe1cd928f92f4110bb49c3a33dc6914a4b2ead;hp=1e8289c40a4a83863632925e3b04f670a5a21d2b;hb=66510491d170867dfd28768cd5e385fe97a7fd9a;hpb=787f578b952771205b94fb914b9a950005b961a6;ds=sidebyside

diff --git a/nativebridge/bin/enable_nativebridge b/nativebridge/bin/enable_nativebridge
index 1e8289c..70fe1cd 100644
--- a/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@ -7,19 +7,29 @@ dest_dir=/system/lib$1/arm$1
 binfmt_misc_dir=/proc/sys/fs/binfmt_misc
 
 cd /data/arm
-while ! busybox mount houdini$1.sfs $dest_dir; do
-	while [ "$(getprop net.dns1)" = "" ]; do
-		sleep 10
-	done
-	if [ -z "$1" ]; then
-		[ "`uname -m`" = "x86_64" ] && url=http://goo.gl/Knnmyl || url=http://goo.gl/JsoX2C
-	else
-		url=http://goo.gl/n6KtQa
+if [ -e /system/lib$1/libhoudini.so ]; then
+	log -pi -thoudini "found /system/lib$1/libhoudini.so"
+elif [ -e /system/etc/houdini$1.sfs ]; then
+	busybox mount /system/etc/houdini$1.sfs $dest_dir
+else
+	if mountpoint -q $dest_dir; then
+		kill -9 `fuser -m $dest_dir`
+		umount -f $dest_dir
 	fi
-	wget $url -cO houdini$1.sfs && continue
-	rm -f houdini$1.sfs
-	sleep 30
-done
+	while ! busybox mount houdini$1.sfs $dest_dir; do
+		while [ "$(getprop net.dns1)" = "" ]; do
+			sleep 10
+		done
+		if [ -z "$1" ]; then
+			[ "`uname -m`" = "x86_64" ] && url=http://goo.gl/Knnmyl || url=http://goo.gl/JsoX2C
+		else
+			url=http://goo.gl/n6KtQa
+		fi
+		wget $url -cO houdini$1.sfs && continue
+		rm -f houdini$1.sfs
+		sleep 30
+	done
+fi
 
 
 # if you don't see the files 'register' and 'status' in /proc/sys/fs/binfmt_misc