X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/6fe8fc2149b6fd44b542eb1b77c9afb8b9946c6a..15a644cdfe990d1eaecc21dd24209b82c07a4da3:/scripts/run-container.sh

diff --git a/scripts/run-container.sh b/scripts/run-container.sh
index 04c8818..43345ee 100644
--- a/scripts/run-container.sh
+++ b/scripts/run-container.sh
@@ -1,17 +1,30 @@
 #!/bin/bash
 cd /home/anbox
 
+if [ ! -e /dev/anbox-hwbinder ] || [ ! -e /dev/ashmem ]; then
+    modprobe binder_linux devices="anbox-binder,anbox-hwbinder,anbox-vndbinder"
+    modprobe ashmem_linux
+    mkdir /dev/binderfs
+    mount -t binder binder /dev/binderfs
+    ln -s /dev/binderfs/* /dev/
+fi
+if [ ! -e /dev/anbox-hwbinder ] || [ ! -e /dev/ashmem ]; then
+    echo "ERROR: Binder and ashmem nodes not found!"
+    exit
+fi
+
 # just in case, stop Anbox 7
 stop anbox-container || true
 
 # start cgroup-lite, else container may fail to start.
 start cgroup-lite
+umount -l /sys/fs/cgroup/schedtune
 
 # start sensors hal
 start anbox-sensors
 
-# start lxc-net, that sets up lxc bridge
-start lxc-net
+# start anbox-net, that sets up lxc bridge
+/home/anbox/anbox-net.sh start
 
 # stop nfcd to not conflict with anbox
 stop nfcd
@@ -19,8 +32,6 @@ stop nfcd
 # umount rootfs if it was mounted
 umount -l rootfs || true
 
-mkdir -p /home/anbox/rootfs
-mkdir -p /home/anbox/data
 mount anbox_arm64_system.img rootfs
 mount -o remount,ro rootfs
 mount anbox_arm64_vendor.img rootfs/vendor
@@ -35,31 +46,9 @@ else
     fi
 fi
 
-# TODO: Move this to installer script
-SKU=`getprop ro.boot.product.hardware.sku`
-mount -o remount,rw rootfs/vendor
-cp -p /vendor/etc/permissions/android.hardware.nfc.* rootfs/vendor/etc/permissions/
-cp -p /vendor/etc/permissions/android.hardware.consumerir.xml rootfs/vendor/etc/permissions/
-cp -p /odm/etc/permissions/android.hardware.nfc.* rootfs/vendor/etc/permissions/
-cp -p /odm/etc/permissions/android.hardware.consumerir.xml rootfs/vendor/etc/permissions/
-if [ ! -z $SKU ]; then
-    cp -p /odm/etc/permissions/sku_${SKU}/android.hardware.nfc.* rootfs/vendor/etc/permissions/
-    cp -p /odm/etc/permissions/sku_${SKU}/android.hardware.consumerir.xml rootfs/vendor/etc/permissions/
-fi
-if [ -f /vendor/lib/libladder.so ] && [ ! -f rootfs/vendor/lib/libladder.so ]; then
-    cd rootfs/vendor/lib
-    wget https://github.com/GS290-dev/gigaset_gs290_dump/raw/full_k63v2_64_bsp-user-10-QP1A.190711.020-1597810494-release-keys/vendor/lib/libladder.so
-    cd ../../..
-fi
-if [ -f /vendor/lib64/libladder.so ] && [ ! -f rootfs/vendor/lib64/libladder.so ]; then
-    cd rootfs/vendor/lib64
-    wget https://github.com/GS290-dev/gigaset_gs290_dump/raw/full_k63v2_64_bsp-user-10-QP1A.190711.020-1597810494-release-keys/vendor/lib64/libladder.so
-    cd ../../..
-fi
-mount -o remount,ro rootfs/vendor
-
 # Anbox binder permissions
 chmod 666 /dev/anbox-*binder
+chmod 777 /dev/ashmem
 
 # Wayland socket permissions
 chmod 777 -R /run/user/32011
@@ -76,4 +65,9 @@ chmod 777 /dev/mtk_cmdq
 chmod 777 /dev/video32
 chmod 777 /dev/video33
 
+# Graphics nodes permissions
+chmod 777 -R /dev/dri/*
+chmod 777 -R /dev/graphics/*
+chmod 777 -R /dev/fb*
+
 lxc-start -n anbox -F -- /init