From nobody Mon Jan 22 14:33:38 2024 X-Original-To: dev-commits-src-branches@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 4TJXlQ3wVHz58203; Mon, 22 Jan 2024 14:33: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 4TJXlQ3M5Gz4F4y; Mon, 22 Jan 2024 14:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705934018; 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=FJbezc6jyp9DCmq1KfnMKhzHHCQkjz5OHTjHr1uq/Y4=; b=vFfPgOKuDHja5cF7nayeifjWEFFTX75X767D+fJNPYm+66euMN1l9CwfmfluzHHpoam5zb QGEWV9D9ktga/RKXISG+T1drCRttmu8Re6DxZzmlsLtGbE1T2z+7xMZIuwHGVhNZlcwU1M worV73jIwtkgFVUnB+CLLW/tDpj7sH5eIT73vXY6lofA+JE/5F7nYp07/cWpqja4lvpadO r21jlBhD6UIJI5db010O870y8loSb1aSwdUm+0jGEWHLhyDkZgvNsTMIJYuWnlOTIi1yy5 57R50nVrm0t//OZgpItz33P1ycf1whNnynXt31MT8GgTJer55QLGoYnbrZlxgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705934018; 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=FJbezc6jyp9DCmq1KfnMKhzHHCQkjz5OHTjHr1uq/Y4=; b=WJ7M4z4SndKY6Z39nrwalu2Z/dJCkrxZ3FhpJPq6MV2IxJV7mUVUbur8oeJhX8QFKNAdMo xMC7YHDm7FhQq0Qoqbp8jGLcX7nQpAQTvYaCSi3UMJ1TxRAvu/zxGpUhahvza+fgnI7m8/ LJJ4+CAHkLa9HoTDU0RyvhA6ctlj29AmO/YMd0JZRX1+knte39n98fJk/EiyPIQqBwq1s6 aCRAxRR/yJoL+omGmu9Ir2UQq1z3OuIGrkB0J+f11jOmTYMQCUTiO4dyRBmMUSuUWb4loR SDlHnS13dqCB+qwsPsAw5deeXTCBaeIBpZv+QegQelnrDwN9XpPx9xERoR8icw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705934018; a=rsa-sha256; cv=none; b=Mh3a3LqQjReNF1ONFhsXaIZFGFFDn/50y7dxT9SOYO11b2bGO/CaRHLYkk5kKuCIRgVSWM 7S99BkHXcA1DEQC67Tg5DBW8loQJONqAQP2hxtbgWw3vBBOz0SSEodfm2ZIvY/h+qxrgMn WSgmwdIHRMN/rAeslmyxbEOjGf+/w4MfQtJsn0djbqHWcw+nSMkzbPJo8KAQUooEtgpCVQ 9QsjskysQ3JhoRy3Wc+7+uAI6AKQB+D+FQsXAFrQEr3FInm2RjIvFWF2K0mHVFDDJvxxwe H3lijofacYUZxOS9cR0s22GxxpiCNTz3nhM5EQ1QEYUdo/KKcB21JnaEE4SP0Q== 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 4TJXlQ2QqQz15JH; Mon, 22 Jan 2024 14:33:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40MEXcPT016964; Mon, 22 Jan 2024 14:33:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MEXclV016961; Mon, 22 Jan 2024 14:33:38 GMT (envelope-from git) Date: Mon, 22 Jan 2024 14:33:38 GMT Message-Id: <202401221433.40MEXclV016961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1614823a499a - stable/13 - release/oci.conf: add missing vm_extra_pre_umount() steps List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 1614823a499aa7a46aa8ab4ed06a6d1b71e0bdd9 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1614823a499aa7a46aa8ab4ed06a6d1b71e0bdd9 commit 1614823a499aa7a46aa8ab4ed06a6d1b71e0bdd9 Author: Ed Maste AuthorDate: 2023-05-24 15:45:29 +0000 Commit: Ed Maste CommitDate: 2024-01-22 14:33:06 +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 (cherry picked from commit ae60012e46ecfe59a3506b903e685b6a3347807b) --- 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 }