svn commit: r358302 - stable/12/release/tools

[Colin Percival]

Author: cperciva
Date: Tue Feb 25 00:36:16 2020
New Revision: 358302
URL: https://svnweb.freebsd.org/changeset/base/358302

Log:
  MFC r357749: Remove /qemu from EC2 ARM AMIs.

Modified:
  stable/12/release/tools/ec2.conf
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/release/tools/ec2.conf
==============================================================================
--- stable/12/release/tools/ec2.conf	Mon Feb 24 21:07:30 2020	(r358301)
+++ stable/12/release/tools/ec2.conf	Tue Feb 25 00:36:16 2020	(r358302)
@@ -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