diff --git a/scripts/container-manager.sh b/scripts/container-manager.sh index 12dfff6..9afaacb 100755 --- a/scripts/container-manager.sh +++ b/scripts/container-manager.sh @@ -9,30 +9,12 @@ set -x DATA_PATH=$SNAP_COMMON/ ROOTFS_PATH=$DATA_PATH/rootfs ANDROID_IMG=$SNAP/android.img -CONTAINER_BASE_UID=100000 if [ ! -e $ANDROID_IMG ]; then echo "ERROR: android image does not exist" exit 1 fi -load_kernel_modules() { - kversion=`uname -r` - rmmod ashmem_linux binder_linux || true - echo "Loading kernel modules for version $kversion.." - if ! `modprobe binder_linux` ; then - echo "ERROR: Failed to load kernel binder driver" - return - fi - if ! `modprobe ashmem_linux` ; then - echo "ERROR: Failed to load kernel ashmem driver" - return - fi - sleep 0.5 - chmod 666 /dev/binder - chmod 666 /dev/ashmem -} - start() { # Make sure our setup path for the container rootfs # is present as lxc is statically configured for @@ -43,11 +25,6 @@ start() { # possible. See snapcraft.yaml for further details. $SNAP/bin/anbox-bridge.sh start - # This will try to load the kernel modules. If this fails we will - # continue as normal and anbox will fail later on and report a - # visible error message to the user. - load_kernel_modules - # Ensure FUSE support for user namespaces is enabled echo Y | sudo tee /sys/module/fuse/parameters/userns_mounts || echo "WARNING: kernel doesn't support fuse in user namespaces" @@ -58,14 +35,7 @@ start() { } stop() { - for dir in cache data; do - umount $ROOTFS_PATH/$dir - done - umount $ROOTFS_PATH - $SNAP/bin/anbox-bridge.sh stop - - rmmod ashmem_linux binder_linux || true } case "$1" in