Check no mounts prior to 'sudo rm -rf' (zlibs/{helpers,bootstrap})
Signed-off-by: gryrmln <gryrmln@localhost>
This commit is contained in:
parent
3cffb94e5c
commit
25a86b7428
|
|
@ -246,7 +246,17 @@ bootstrap_cpio_unpack()
|
||||||
notice "Unpacking bootstrap cpio archive: $_bootstrap_cpio"
|
notice "Unpacking bootstrap cpio archive: $_bootstrap_cpio"
|
||||||
silly
|
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; }
|
pushd "$strapdir" || { zerr; return 1; }
|
||||||
zcat "$_bootstrap_cpio" | sudo cpio -idmn --format=newc || { zerr; return 1; }
|
zcat "$_bootstrap_cpio" | sudo cpio -idmn --format=newc || { zerr; return 1; }
|
||||||
|
|
|
||||||
|
|
@ -113,6 +113,14 @@ clean_strapdir()
|
||||||
|
|
||||||
notice "Cleaning 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"
|
sudo rm -rf "$strapdir"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue