Merge remote-tracking branch 'x86/oreo-x86' into pie-x86

[android-x86/device-generic-common.git] / nativebridge / bin / enable_nativebridge

diff --git a/nativebridge/bin/enable_nativebridge b/nativebridge/bin/enable_nativebridge
index afe2115..32b2e2f 100644 (file)
--- a/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@ -13,6 +13,11 @@ urls[3]=http://tinyurl.com/y3nagyza
 urls[4]=http://tinyurl.com/y6azmjas
 urls[5]=http://tinyurl.com/y6g6cx27
 
+mount_sfs()
+{
+       mount -o 'context="u:object_r:system_file:s0"' $1 $2
+}
+
 if [ -z "$1" ]; then
        v=9_y
        u=1
@@ -24,22 +29,23 @@ fi
 if [ -s /system/lib$1/libhoudini.so ]; then
        log -pi -thoudini "found /system/lib$1/libhoudini.so"
 elif [ -e /system/etc/houdini$v.sfs ]; then
-       mount /system/etc/houdini$v.sfs $dest_dir
+       mount_sfs /system/etc/houdini$v.sfs $dest_dir
 else
        if mountpoint -q $dest_dir; then
                kill -9 `fuser -m $dest_dir`
                umount -f $dest_dir
        fi
-       mkdir -p /data/arm
-       cd /data/arm
-       while ! mount houdini$v.sfs $dest_dir; do
+       if [ ! -d /data/media/0/arm ]; then
+               mkdir -p /data/media/0/arm
+               chown 1023.1023 /data/media/0/arm
+       fi
+       cd /data/media/0/arm
+       [ -s /data/arm/houdini$v.sfs ] && mv /data/arm/houdini$v.sfs .
+       while ! mount_sfs houdini$v.sfs $dest_dir; do
                while [ "$(getprop net.dns1)" = "" ]; do
                        sleep 10
                done
-               wget ${urls[$u%6]} -cO houdini$v.sfs && continue
-               rm -f houdini$v.sfs
-               sleep 30
-               let u+=3
+               [ -s houdini$v.sfs ] && sleep 10 || sleep 30
        done
 fi