anbox: Stop nfcd to avoid conflicting with host services

[waydroid.git] / scripts / run-container.sh

diff --git a/scripts/run-container.sh b/scripts/run-container.sh
index b620138a873ea298cb3d28792ea123a7c26dea17..3df5657db2e8c246a912f622aecd72d4aea6a5b0 100644 (file)
--- a/scripts/run-container.sh
+++ b/scripts/run-container.sh
@@ -13,6 +13,9 @@ start anbox-sensors
 # start lxc-net, that sets up lxc bridge
 start lxc-net
 
+# stop nfcd to not conflict with anbox
+stop nfcd
+
 # umount rootfs if it was mounted
 umount -l rootfs || true
 
@@ -24,6 +27,14 @@ mount anbox_arm64_vendor.img rootfs/vendor
 mount -o remount,ro rootfs
 mount -o bind anbox.prop rootfs/vendor/anbox.prop
 
+if mountpoint -q -- /odm; then
+    mount -o bind /odm rootfs/odm_extra
+else
+    if [ -d /vendor/odm ]; then
+        mount -o bind /vendor/odm rootfs/odm_extra
+    fi
+fi
+
 # Anbox binder permissions
 chmod 666 /dev/anbox-*binder