diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2020-02-11 04:03:22 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2020-02-11 04:03:22 +0000 |
| commit | d82420cbfce81ded27dd1debbf197a2235ec070d (patch) | |
| tree | 80a6de8aef52bb875e65b5b1c86dc8764473d7ac /release/tools | |
| parent | 2e57c8fde7335793b4d4da78a08946342403ba54 (diff) | |
| download | src-d82420cbfce81ded27dd1debbf197a2235ec070d.tar.gz src-d82420cbfce81ded27dd1debbf197a2235ec070d.zip | |
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
Notes
Notes:
svn path=/head/; revision=357749
Diffstat (limited to 'release/tools')
| -rw-r--r-- | release/tools/ec2.conf | 3 |
1 files changed, 3 insertions, 0 deletions
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 |