anbox: Add support for lxc 3 and greater

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

diff --git a/scripts/run-container.sh b/scripts/run-container.sh
index 43345eeb561ea25835954986e47cd30c0b6cdb80..051b4295d6292bdd8d5c97c2e72acb2015b48b96 100644 (file)
--- a/scripts/run-container.sh
+++ b/scripts/run-container.sh
@@ -32,9 +32,9 @@ stop nfcd
 # umount rootfs if it was mounted
 umount -l rootfs || true
 
-mount anbox_arm64_system.img rootfs
+mount anbox_*_system.img rootfs
 mount -o remount,ro rootfs
-mount anbox_arm64_vendor.img rootfs/vendor
+mount anbox_*_vendor.img rootfs/vendor
 mount -o remount,ro rootfs/vendor
 mount -o bind anbox.prop rootfs/vendor/anbox.prop
 
@@ -50,8 +50,11 @@ fi
 chmod 666 /dev/anbox-*binder
 chmod 777 /dev/ashmem
 
-# Wayland socket permissions
-chmod 777 -R /run/user/32011
+# Wayland and pulse socket permissions
+XDG_PATH=`cat anbox.prop | grep anbox.xdg_runtime_dir | cut -f 2- -d "="`
+PULSE_PATH=`cat anbox.prop | grep anbox.pulse_runtime_path | cut -f 2- -d "="`
+chmod 777 -R $PULSE_PATH
+chmod 777 -R $XDG_PATH
 
 # Set sw_sync permissions
 chmod 777 /dev/sw_sync