From nobody Wed May 24 17:11:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QRHlt2HT7z4THcH; Wed, 24 May 2023 17:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QRHlt1mG4z4Cwt; Wed, 24 May 2023 17:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684948298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v4i46aVFaUgP79AOVNQLcryPLzu4o2+rC5WTjkiQ1HY=; b=rl0nGCwjIT34JU51iet72az4LYMXEOPJm7P32K/dlTkuStJ8dbjI3hb8i5a+k44RKc659T jwGlOGMMqE9BM8TiSEPwqDXIeC/rKsCcvso1/GhqBA/bsuCl4NxE4nAoGh099/Epzs7Cpp JnA/zK5VHOfBLI507/YpcK83a3xdz5j9iePZeGgJb+1ysbhN7RbuWczc+J85y7tbZ+RSQl vIzMYkIYNKkCARYBH2jSrCs9+da3/R7Cqs6BxUaiCWt7HpZIwzpSUHhfj/z5VFdDMJJCOO xTSnfCHNNR2dxn1t0xZi7CM7SJGkxODYP4s/836Mm6JO/LdwFkDGLiW/mAuVnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684948298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v4i46aVFaUgP79AOVNQLcryPLzu4o2+rC5WTjkiQ1HY=; b=r/VWcMJOvLWOoQbce8exXBheZSrR48SqmhuBTULLHO9SUJHNyRH9hY/XE7TAQE+jJXBDDr zDyIhHA9LPL9lZz2JmNP/txmuvd4/1/Vrm/FX20Vb58fEQxhUrJGK71SY2jyhVV5A7Mvj2 7rwMhpnwJF24WSdge8yOP+/Y6WAZzMRWN2LUhvCmqcSPUfjeD7E0yII0lZRyJKt2rRaqLi 18UZtOQgYR0p/ApZA9cdvuQESN7vbHi4o1LPHaJ5NBSEfV4jqgQTufvdvwzu+g4P8r85xm IvGOVHvCoc2ZXGjLMyAV8TCNR8jHKVaAXqcw5qny5utPv4/iL18dJrxSjcY2lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684948298; a=rsa-sha256; cv=none; b=mZP10U0m0Ig/KsUw8rVTun/sMF9bc4rFWY4MNMzv+xdIWyypvcM9TQD/fPhimZtFlgF5Qd HTMwj5wrUY785y95tr7QV/r+SqvIVJ1jp/c+aChgh//kye+rkZ0Keg4bXK5oYBFSH1CPfk z2t6pXg90jGaBerd96FfrKk40kJz4TfBWwdDCsPy3l66AEZpANM24JotBZq+hBw/TNkG7C hSe9QeIgCqm5wmBPpFvmOW9OP1SV1kz9Hgb5SH76xscmW51sfMZtHgMjyeHqPKvEfSwJXR 8QJOXI3oVmUyZvedXH5sa7lzAGviqQpiPa405IV7YplD08jkCudFYO1EdxMUrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QRHlt0q5Bzqgd; Wed, 24 May 2023 17:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34OHBcb8065885; Wed, 24 May 2023 17:11:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34OHBcch065870; Wed, 24 May 2023 17:11:38 GMT (envelope-from git) Date: Wed, 24 May 2023 17:11:38 GMT Message-Id: <202305241711.34OHBcch065870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ae60012e46ec - main - release/oci.conf: add missing vm_extra_pre_umount() steps List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae60012e46ecfe59a3506b903e685b6a3347807b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ae60012e46ecfe59a3506b903e685b6a3347807b commit ae60012e46ecfe59a3506b903e685b6a3347807b Author: Ed Maste AuthorDate: 2023-05-24 15:45:29 +0000 Commit: Ed Maste 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 }