Date: Wed, 24 May 2023 17:11:38 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ae60012e46ec - main - release/oci.conf: add missing vm_extra_pre_umount() steps Message-ID: <202305241711.34OHBcch065870@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ae60012e46ecfe59a3506b903e685b6a3347807b commit ae60012e46ecfe59a3506b903e685b6a3347807b Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2023-05-24 15:45:29 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2023-05-24 17:11:07 +0000 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 --- release/tools/oci.conf | 5 +++++ 1 file changed, 5 insertions(+) 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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305241711.34OHBcch065870>