Skip to content

[ubu-chroot] Make bind mounts more robust and less dangerous #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martyone wants to merge 1 commit into
base: mer-master
Choose a base branch
from
Open

[ubu-chroot] Make bind mounts more robust and less dangerous #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 34 additions & 6 deletions mer-android-chroot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,40 @@ umask 022

################################################################
# Mount

# In order to deal with varying status of adoption of changes to FHS among
# distributions a list of alternate paths is considered for binding.
mount_bind() {
if [[ ! -d ${uburoot}$1 ]]; then
rm -f ${uburoot}$1
mkdir -p ${uburoot}$1
maybe_symlinks="$*"
src=""
dsts=""

for dir in $maybe_symlinks; do
if [[ -d $dir ]]; then
src="$dir"
break
fi
done

if [[ -z "$src" ]]; then
echo "mount_bind $*: None of these exists on your host - please report this bug"
return
fi
mount --bind $1 ${uburoot}$1

for dir in $maybe_symlinks; do
if [[ -e ${uburoot}$dir && ! -L ${uburoot}$dir ]]; then
dsts="$dsts $dir"
fi
done

if [[ -z "$dsts" ]]; then
echo "mount_bind $*: No non-symlink target in SDK root - please report this bug"
return
fi

for dst in $dsts; do
mount --bind $src ${uburoot}$dst
done
}
prepare_mountpoints() {
# Make parent mountpoint not shared with parent namespace
Expand All @@ -168,7 +196,7 @@ prepare_mountpoints() {
mount_bind /sys
mount_bind /dev
mount_bind /dev/pts
mount_bind /dev/shm
mount_bind /dev/shm /run/shm
mount_bind /var/lib/dbus
mount_bind /var/run/dbus

Expand All @@ -186,7 +214,7 @@ umount_spare() {
# for some reason these seem to escape the unshare -m
umount ${uburoot}/proc/sys/fs/binfmt_misc || :
umount ${uburoot}/dev/pts || :
umount ${uburoot}/dev/shm || :
umount ${uburoot}/dev/shm ${uburoot}/run/shm || :
umount ${uburoot}/var/run/dbus || :
}

Expand Down