jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scripts: container-mgr: get rid of a few things (kmods, base uid, umount)

Browse source
This commit is contained in:
Simon Fels 2017-02-19 11:39:36 +01:00
commit 5881a514de
1 changed files with 0 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

30
scripts/container-manager.sh
View file

@ -9,30 +9,12 @@ set -x
DATA_PATH=$SNAP_COMMON/ DATA_PATH=$SNAP_COMMON/
ROOTFS_PATH=$DATA_PATH/rootfs ROOTFS_PATH=$DATA_PATH/rootfs
ANDROID_IMG=$SNAP/android.img ANDROID_IMG=$SNAP/android.img
CONTAINER_BASE_UID=100000
if [ ! -e $ANDROID_IMG ]; then if [ ! -e $ANDROID_IMG ]; then
echo "ERROR: android image does not exist" echo "ERROR: android image does not exist"
exit 1 exit 1
fi 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() { start() {
# Make sure our setup path for the container rootfs # Make sure our setup path for the container rootfs
# is present as lxc is statically configured for # is present as lxc is statically configured for
@ -43,11 +25,6 @@ start() {
# possible. See snapcraft.yaml for further details. # possible. See snapcraft.yaml for further details.
$SNAP/bin/anbox-bridge.sh start $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 # 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" 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() { stop() {
for dir in cache data; do
umount $ROOTFS_PATH/$dir
done
umount $ROOTFS_PATH
$SNAP/bin/anbox-bridge.sh stop $SNAP/bin/anbox-bridge.sh stop
rmmod ashmem_linux binder_linux || true
} }
case "$1" in case "$1" in