diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2023-05-24 15:45:29 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2023-05-24 17:11:07 +0000 |
| commit | ae60012e46ecfe59a3506b903e685b6a3347807b (patch) | |
| tree | 6393ad2185a22c4b3cad40399f4faea6ca310bcb | |
| parent | 6342c9ed178e6507d29accd07f1d53bb827162f7 (diff) | |
| download | src-ae60012e46ecfe59a3506b903e685b6a3347807b.tar.gz src-ae60012e46ecfe59a3506b903e685b6a3347807b.zip | |
release/oci.conf: add missing vm_extra_pre_umount() steps
vm.subr's default vm_extra_pre_umount removes /qemu and
/etc/resolv.conf. When vm_extra_pre_umount is overridden these steps
need to be performed in the cloud-specific conf file.
PR: 271602
Reviewed by: dch, lwhsu
Event: Kitchener-Waterloo Hackathon 202305
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D40257
| -rw-r--r-- | release/tools/oci.conf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/release/tools/oci.conf b/release/tools/oci.conf index 7260cd24defd..47231d65d79b 100644 --- a/release/tools/oci.conf +++ b/release/tools/oci.conf @@ -90,5 +90,10 @@ EOF touch ${DESTDIR}/firstboot + if ! [ -z "${QEMUSTATIC}" ]; then + rm -f ${DESTDIR}/${EMULATOR} + fi + rm -f ${DESTDIR}/etc/resolv.conf + return 0 } |