From 25a86b7428eabe0ab7f3a45daa76ff84a07af450 Mon Sep 17 00:00:00 2001
From: gryrmln <gryrmln@localhost>
Date: Fri, 2 Apr 2021 12:00:46 +0100
Subject: [PATCH] Check no mounts prior to 'sudo rm -rf'
 (zlibs/{helpers,bootstrap})

Signed-off-by: gryrmln <gryrmln@localhost>
---
 zlibs/bootstrap | 12 +++++++++++-
 zlibs/helpers   |  8 ++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/zlibs/bootstrap b/zlibs/bootstrap
index 20970b4..ec20215 100644
--- a/zlibs/bootstrap
+++ b/zlibs/bootstrap
@@ -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; }
diff --git a/zlibs/helpers b/zlibs/helpers
index ea51ab0..7bb3203 100644
--- a/zlibs/helpers
+++ b/zlibs/helpers
@@ -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"
 }