Skip to content
This repository has been archived by the owner on Jan 12, 2021. It is now read-only.

Commit

Permalink
Adapt pre-start.sh to work both with Halium 9 and older ports
Browse files Browse the repository at this point in the history
Device with android-ramdisk.img present is considered to be
pre-Halium 9 device.
  • Loading branch information
NotKit committed May 26, 2020
1 parent 4b9c97b commit 0958fa1
Showing 1 changed file with 28 additions and 22 deletions.
50 changes: 28 additions & 22 deletions var/lib/lxc/android/pre-start.sh
@@ -1,33 +1,39 @@

#!/bin/sh

for mountpoint in /android/*; do
mount_name=`basename $mountpoint`
desired_mount=$LXC_ROOTFS_PATH/$mount_name
if [ -f "/android/system/boot/android-ramdisk.img" ]; then
# Halium 7 or below where ramdisk is extracted to tmpfs
for mountpoint in /android/*; do
mount_name=`basename $mountpoint`
desired_mount=$LXC_ROOTFS_PATH/$mount_name

# Remove symlinks, for example bullhead has /vendor -> /system/vendor
[ -L $desired_mount ] && rm $desired_mount
# Remove symlinks, for example bullhead has /vendor -> /system/vendor
[ -L $desired_mount ] && rm $desired_mount

[ -d $desired_mount ] || mkdir $desired_mount
mount --bind $mountpoint $desired_mount
done
[ -d $desired_mount ] || mkdir $desired_mount
mount --bind $mountpoint $desired_mount
done

mknod -m 666 $LXC_ROOTFS_PATH/dev/null c 1 3
mknod -m 666 $LXC_ROOTFS_PATH/dev/null c 1 3

# Create /dev/pts if missing
mkdir -p $LXC_ROOTFS_PATH/dev/pts
# Create /dev/pts if missing
mkdir -p $LXC_ROOTFS_PATH/dev/pts

# Pass /sockets through
mkdir -p /dev/socket $LXC_ROOTFS_PATH/socket
mount -n -o bind,rw /dev/socket $LXC_ROOTFS_PATH/socket
# Pass /sockets through
mkdir -p /dev/socket $LXC_ROOTFS_PATH/socket
mount -n -o bind,rw /dev/socket $LXC_ROOTFS_PATH/socket

rm $LXC_ROOTFS_PATH/sbin/adbd
rm $LXC_ROOTFS_PATH/sbin/adbd

sed -i '/on early-init/a \ mkdir /dev/socket\n\ mount none /socket /dev/socket bind' $LXC_ROOTFS_PATH/init.rc
sed -i '/on early-init/a \ mkdir /dev/socket\n\ mount none /socket /dev/socket bind' $LXC_ROOTFS_PATH/init.rc

sed -i "/mount_all /d" $LXC_ROOTFS_PATH/init.*.rc
sed -i "/swapon_all /d" $LXC_ROOTFS_PATH/init.*.rc
sed -i "/on nonencrypted/d" $LXC_ROOTFS_PATH/init.rc
sed -i "/mount_all /d" $LXC_ROOTFS_PATH/init.*.rc
sed -i "/swapon_all /d" $LXC_ROOTFS_PATH/init.*.rc
sed -i "/on nonencrypted/d" $LXC_ROOTFS_PATH/init.rc

# Config snippet scripts
run-parts /var/lib/lxc/android/pre-start.d || true
# Config snippet scripts
run-parts /var/lib/lxc/android/pre-start.d || true
else
# Halium 9
mkdir -p /dev/__properties__
mkdir -p /dev/socket
fi

0 comments on commit 0958fa1

Please sign in to comment.