From: deraadt <deraadt@openbsd.org>
Date: Thu, 31 Mar 2022 16:16:09 +0000 (+0000)
Subject: on-ramdisk firmware extraction can overflow the install-media directory
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=de0ba0e7c85e6a4b8e295bc774edb56684cdca77;p=openbsd

on-ramdisk firmware extraction can overflow the install-media directory
because of the the tar+mv combination.  Purge both path variations
better, so that an interrupted install can be restarted.
ok miod abieber kettenis
---

diff --git a/distrib/arm64/ramdisk/install.md b/distrib/arm64/ramdisk/install.md
index abd5fdfdc1b..7e2fa08990d 100644
--- a/distrib/arm64/ramdisk/install.md
+++ b/distrib/arm64/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.30 2022/03/28 18:53:40 kettenis Exp $
+#	$OpenBSD: install.md,v 1.31 2022/03/31 16:16:09 deraadt Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -209,7 +209,7 @@ md_consoleinfo() {
 	apple,*)
 		make_dev sd0
 		if mount -o ro /dev/sd0l /mnt2 2>/dev/null; then
-			rm -rf /usr/mdec/rpi
+			rm -rf /usr/mdec/rpi /etc/firmware/brcm /etc/firmware/apple-bwfm
 			if [[ -s /mnt2/vendorfw/firmware.tar ]]; then
 				tar -x -C /etc/firmware \
 				    -f /mnt2/vendorfw/firmware.tar "*$_fw*"