From nobody Sat Oct 11 00:05:37 2025 X-Original-To: dev-commits-src-all@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 4ck3m159cbz6CDFw; Sat, 11 Oct 2025 00:05:37 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ck3m14Nqcz3XZF; Sat, 11 Oct 2025 00:05:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760141137; 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=KnAyJ6h1czg1WwLAsGwvIG54pSlvmznjx6F/d+6Qm2k=; b=bFDeq35qAPAw82HgHp+hY6FXbEqCg0wbvswf+TdOYcnAVUEhf115lvkqzBgEF8q8I4iScw KqJStACmxvDPnL1P9k0LPCCiTvrlQ6JHzc8/6erVf4pwTqwaKlCw+joaqw+gA1/bE0Fmcx 3hYX/uQr7QfAXiI0ymwNyhlt6ofh1m5qiidpvutQmj9AfqyIGy0A/jebhwSg8aGwsykmBl xmvgvSx5gT0DbtUDMxmkVoXV6ypsNxFV6FYezI4X5mUuUgUr76VW7cXhOeZ2x8yT9BAvvX DkJOgsvc+DOCkIky3EDPzkjMlDNyAbkUzEEC4GXW0ADeFPt/pTHOADl+eg6TCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760141137; 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=KnAyJ6h1czg1WwLAsGwvIG54pSlvmznjx6F/d+6Qm2k=; b=J9dYOj0cOU+CrVtfsnqFunXiDJrV+SggS12Rg6wdfRHzRUZunw+WKAmrlWadj4L3whIf9O NoFa5SOwNqTzjBzbyFS+IrvyEiOQZ//4iYzHKyzlTjIDEceLCSuTHbQt4S0e4zuc97sSkb mi+MJVnFszN9tTSHeccglFIRUKE7vhvLGnc3N0dTXVm6S9dSKTXEUPiPxwjfyS/iA8PeUG JH6SRVnp/HEv2zculd5zrQ+XVqI2q72GUbExcFH08+uJ4r+u4dX9Z0dQbJ596XT0yqFjqn rgyCPH4C5Y+eEZ+MhGurd19rIRpC799tSMXv1p+TOwV8jXgVp76HrGfcsTR9sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760141137; a=rsa-sha256; cv=none; b=ELmXlGMDy9+sFH/Buy7/gq/Qi43Qt4QWzCsT/W3HMm/Y/YW0fMFqygLAFXR2b6NGIEt7+P fiWUt+DMAhvbqIgBTAju2JoCEDG2u1M1rZADqVyDXqBh4OwMCZJ2w5LR2L7tiVJ4Do89kE f4wmo+y+r7RvuWtjCvdh9KL/XrnlXzbepgIelcBHP09DtFbo+OYv7T5aqZQGcUYAmtoq0i RPE8JoWpLLUFMnMplWcb9hV4LT6FB3strJVRYRXcbixPfQ49HRmZIwGw95md5+Dz4ThZCa mI9jDM2pFfoFzJk7v9xSicRF4weXpsFY+Q07ZrNEmsJo+erVs81Yj6Lw3FNGfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ck3m13zx7z1Nty; Sat, 11 Oct 2025 00:05:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59B05bq7083422; Sat, 11 Oct 2025 00:05:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59B05bGE083419; Sat, 11 Oct 2025 00:05:37 GMT (envelope-from git) Date: Sat, 11 Oct 2025 00:05:37 GMT Message-Id: <202510110005.59B05bGE083419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: b1303ed6369d - releng/15.0 - vmimage.subr: metalog_add generated databases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: b1303ed6369d92cb19667b71ad60ca282c1b6441 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b1303ed6369d92cb19667b71ad60ca282c1b6441 commit b1303ed6369d92cb19667b71ad60ca282c1b6441 Author: Colin Percival AuthorDate: 2025-10-10 22:01:38 +0000 Commit: Colin Percival CommitDate: 2025-10-11 00:05:16 +0000 vmimage.subr: metalog_add generated databases The files /etc/login.conf.db, /etc/passwd, /etc/pwd.db, /etc/spwd.db, and /var/db/services.db are generated at install time. When VM images are built using installworld, there is Makefile code which emits the necessary METALOG lines; but the pkgbase triggers do not do this. This resulted in VM images which lacked these essential database files. VM images are currently the only place where this matters, since this issue is specific to non-root image builds uusing pkgbase. (In some point in the future we will start building release ISO iamges from pkgbase, at which point it will be a problem there as well.) The long-term solution for this is probably to teach the relevant database-creating tools to emit METALOG lines; but for now, just log the necessary files from vmimage.subr. Approved by: re (cperciva) Reviewed by: dch MFC after: 5 minutes Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53034 (cherry picked from commit 6081365c27e68707ad25c98159e364ee90fcf5db) (cherry picked from commit b3c5c7d6f10433497fe66447a22e6184a8e1341f) --- release/tools/vmimage.subr | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 067eb5ea48a8..15c4dd53e70b 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -213,6 +213,16 @@ vm_extra_install_packages() { install -y -r ${PKG_REPO_NAME} $pkg done metalog_add_data ./var/db/pkg/local.sqlite + + # Add some database files which are created by pkg triggers; + # at some point in the future the tools which create these + # files should probably learn how to record them in METALOG + # (which would simplify no-root installworld as well). + metalog_add_data ./etc/login.conf.db + metalog_add_data ./etc/passwd + metalog_add_data ./etc/pwd.db + metalog_add_data ./etc/spwd.db 600 + metalog_add_data ./var/db/services.db else if [ -n "${WITHOUT_QEMU}" ]; then return 0