From d82420cbfce81ded27dd1debbf197a2235ec070d Mon Sep 17 00:00:00 2001
From: Colin Percival <cperciva@FreeBSD.org>
Date: Tue, 11 Feb 2020 04:03:22 +0000
Subject: Remove /qemu from EC2 ARM AMIs

I forgot to do this as part of r345858 -- I added it to the
vm_extra_pre_umount in vmimage.subr but forgot that function
was overridden in the EC2 build.

MFC after:	2 weeks
---
 release/tools/ec2.conf | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'release')

diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index 4f2af08061be..176b98f7a2b0 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -116,6 +116,9 @@ vm_extra_pre_umount() {
 	# * firstboot_pkgs (install packages)
 	touch ${DESTDIR}/firstboot
 
+	if ! [ -z "${QEMUSTATIC}" ]; then
+		rm -f ${DESTDIR}/${EMULATOR}
+	fi
 	rm -f ${DESTDIR}/etc/resolv.conf
 
 	return 0
-- 
cgit v1.2.3