svn commit: r357749 - head/release/tools

[Colin Percival]

Author: cperciva
Date: Tue Feb 11 04:03:22 2020
New Revision: 357749
URL: https://svnweb.freebsd.org/changeset/base/357749

Log:
  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

Modified:
  head/release/tools/ec2.conf

Modified: head/release/tools/ec2.conf
==============================================================================
--- head/release/tools/ec2.conf	Tue Feb 11 03:37:42 2020	(r357748)
+++ head/release/tools/ec2.conf	Tue Feb 11 04:03:22 2020	(r357749)
@@ -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