Merge remote-tracking branch 'upstream/master' into arm64

2021-06-22 15:57:11 +01:00
parent 95ea0ba696 f9d44edb72
commit 4b59b5a70d
5 changed files with 8 additions and 5 deletions
--- a/scripts/common
+++ b/scripts/common
@@ -22,8 +22,10 @@ bootstrap(){

 	capsh --drop=cap_setfcap -- -c "'${BOOTSTRAP_CMD}' $BOOTSTRAP_STR" || true

-	if [ -d "$2/debootstrap" ]; then
-		rmdir "$2/debootstrap"
+	if [ -d "$2/debootstrap" ] && ! rmdir "$2/debootstrap"; then
+		cp "$2/debootstrap/debootstrap.log" "${STAGE_WORK_DIR}"
+		log "bootstrap failed: please check ${STAGE_WORK_DIR}/debootstrap.log"
+		return 1
 	fi
 }
 export -f bootstrap