anbox: Cleanup scripts

diff --git a/scripts/mount.sh b/scripts/mount.sh
deleted file mode 100644 (file)
index 04662df..0000000
--- a/scripts/mount.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-mkdir -p /home/anbox/rootfs
-cd /home/anbox
-mount anbox_arm64_system.img rootfs
-#mount -o remount,ro rootfs
-mount -o ro anbox_arm64_vendor.img rootfs/vendor
-mount -o bind default.prop rootfs/vendor/default.prop
-#mount -o bind rootfs/system/lib64/vndk-sp-28 rootfs/system/lib64/vndk-sp-29

diff --git a/scripts/run-container.sh b/scripts/run-container.sh
index 6bfe06a3d18e12dcdf2df2fb2522fedb875e4179..b0cd87c9c00d26b21bba2aa7abb086096774f0ee 100644 (file)
--- a/scripts/run-container.sh
+++ b/scripts/run-container.sh
@@ -4,8 +4,8 @@ cd /home/anbox
 # just in case, stop Anbox 7
 stop anbox-container || true
 
 # just in case, stop Anbox 7
 stop anbox-container || true
 

-# restart cgroupfs-mount, else container may fail to start on some devices
-restart cgroupfs-mount
+# start cgroup-lite, else container may fail to start.
+start cgroup-lite

 
 # stop sensorfw
 # NOTE: it is temporary solution, that workes only on halium devices.
 
 # stop sensorfw
 # NOTE: it is temporary solution, that workes only on halium devices.


@@ -16,13 +16,19 @@ start lxc-net
 
 # umount rootfs if it was mounted
 umount -l rootfs || true
 
 # umount rootfs if it was mounted
 umount -l rootfs || true

-./mount.sh
+
+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
+mount -o remount,ro rootfs
+mount -o bind anbox.prop rootfs/vendor/anbox.prop

 
 # Anbox binder permissions
 chmod 666 /dev/anbox-*binder
 
 # Wayland socket permissions
 
 # Anbox binder permissions
 chmod 666 /dev/anbox-*binder
 
 # Wayland socket permissions

-chmod 777 /run/user/32011
-chmod 777 /run/user/32011/wayland-1
+chmod 777 -R /run/user/32011

 
 lxc-start -n anbox -F -- /init
 
 lxc-start -n anbox -F -- /init