Check no mounts prior to 'sudo rm -rf' (zlibs/{helpers,bootstrap})

Signed-off-by: gryrmln <gryrmln@localhost>
This commit is contained in:
gryrmln 2021-04-02 12:00:46 +01:00
parent 3cffb94e5c
commit 25a86b7428
No known key found for this signature in database
GPG Key ID: C90B6A0356F4DB7A
2 changed files with 19 additions and 1 deletions

View File

@ -246,7 +246,17 @@ bootstrap_cpio_unpack()
notice "Unpacking bootstrap cpio archive: $_bootstrap_cpio"
silly
sudo rm -rf "${strapdir}"/*
# Danger Will Robinson
# Check for (bind) mounts as sudo rm -rf will trash the host
for m in sys proc dev; do
if [[ $(mountpoint -q "${strapdir}/$m") ]]; then
zerr
return 1
fi
done
# remove everything, including .dotdirfiles
sudo rm -rf "$strapdir"
mkdir -p "$strapdir"
pushd "$strapdir" || { zerr; return 1; }
zcat "$_bootstrap_cpio" | sudo cpio -idmn --format=newc || { zerr; return 1; }

View File

@ -113,6 +113,14 @@ clean_strapdir()
notice "Cleaning strapdir"
# Danger Will Robinson
# Check for (bind) mounts as sudo rm -rf will trash the host
for m in sys proc dev; do
if [[ $(mountpoint -q "${strapdir}/$m") ]]; then
zerr
return 1
fi
done
sudo rm -rf "$strapdir"
}