From nobody Tue Oct 7 00:56:31 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 4cgd4b5njPz6Bv65; Tue, 07 Oct 2025 00:56:31 +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 4cgd4b56J4z3vnG; Tue, 07 Oct 2025 00:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759798591; 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=4mDxJD9YsKi0L4hD4rX169X1O4FE7zQaKfsm0dRTNTc=; b=Xj4kCRztNpGSrEBRERELawTE5B/WOgxwqyq05zQzjczS4Fp92Uk2jojU5N0gQxekpku/MQ lH8N3DRUN3+cqU9g5y4xHnGxIgPMS/XhmunC48S1+QDUA3RQEg1avajIS4bVpR2pivWoAM OM2aN7aZdOmhZXjybl2JJdOq/cXxqOTngG/9NKriDANp8KDANBllpFq7zQ8pb3sfxjwpyd oN7zYC8jsmuoPb0apl4IZ5IvEAmAXKMnQ6Cs+WWtlpHUL3sYyVy0Axio1WpsmxN9Enxvl7 Qx4Q2AAKJhcus8COLl0gErvrBSZdVhPZeB+WPbtDLLxrMzQo83d87XkC0Jf9LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759798591; 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=4mDxJD9YsKi0L4hD4rX169X1O4FE7zQaKfsm0dRTNTc=; b=Px0O4IY62kHtgcXWVnF/dO+WFKW6djjMY7TPPj91cFD6LjMOLRmsciGd+KsS1z/wGM72ru RZk2qdlY68hbmbU7alkkaXkjGceY/2KKBYEEPoJWxVY/GyFjuDnlQgICOxR71mmgoK+ksb twCy4cGGk2rEcr7WpAN0nXDuxmVMdTUHJDRJO1PojE3LoFtKWOvZmnOryTUR1IDw3x787Y r8dj4j+xUTQajnag3uxE+UEys/kGiul6koCIrvkjUxewdJEVZ1St3wv0f8nQo1Bdt6zzY+ 3JCp1e9o04ZwbUCiPFmNBzTg6etvPtwl1WSGUhG9NzXMiA3B/P0d61u9VSVpHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759798591; a=rsa-sha256; cv=none; b=fT235ZPO6DIMzYb5JVzOGFObgcOS7TwcwtimtS46DocJy9wgRnye3iiqMKIcQZ5K7tLYTx q1PyqhUQpiHggcrpF412IYoBUXE15iGobIDDGYjZzj4Y3SzBDPUIquqwmD36gTy7++E99t p93IJ/3USgCdj+zR/D/zRVL8OI0lCrjoe94oMTBp+D2UqZaRVa+1M2fZOynGB8ks1voPyD 55BT2Hg9YG9BjhKLEUbKaew069ZP4nw7sgkGHYLoTNFkhG+ZNlUJv6JY0/QGenll1GNpFD dxQdRavPfMVjeh4IJpwu+lMeqUH78vmVBBg/pJkS+f1g7hIjuD3GJXgqgaoS5Q== 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 4cgd4b4bVXz72w; Tue, 07 Oct 2025 00:56:31 +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 5970uVlT022725; Tue, 7 Oct 2025 00:56:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5970uVsN022722; Tue, 7 Oct 2025 00:56:31 GMT (envelope-from git) Date: Tue, 7 Oct 2025 00:56:31 GMT Message-Id: <202510070056.5970uVsN022722@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9bb0282097ef - stable/15 - release: Complete NO_ROOTification of Vagrant builds 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9bb0282097efcf7d4b642025e3cf2cc110f2fa87 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9bb0282097efcf7d4b642025e3cf2cc110f2fa87 commit 9bb0282097efcf7d4b642025e3cf2cc110f2fa87 Author: Mark Johnston AuthorDate: 2025-09-19 21:01:52 +0000 Commit: Mark Johnston CommitDate: 2025-10-07 00:56:14 +0000 release: Complete NO_ROOTification of Vagrant builds - Don't clean pkg files, they won't be recorded in the manifest anyway. - Use pw's new metalog mode to create the vagrant user. Note that we do not need to manually create the home directory, pw will do it, so just remove that. - Write metalog entries for the vagrant user's ssh key dir and authorized keys file Note, this depends on an updated pw being installed on the host. Reviewed by: emaste MFC after: 1 day Sponsored by: Klara, Inc. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52631 (cherry picked from commit 02dfca2458081587d8224c5ebf8bde99fa360f94) --- release/tools/vagrant.conf | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf index 7ab0e1238693..5b0f38b740a6 100644 --- a/release/tools/vagrant.conf +++ b/release/tools/vagrant.conf @@ -14,14 +14,16 @@ export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} shells/bash \ export VM_RC_LIST="firstboot_freebsd_update firstboot_pkgs growfs" vagrant_common () { - # The firstboot_pkgs rc.d script will download the repository - # catalogue and install or update pkg when the instance first - # launches, so these files would just be replaced anyway; removing - # them from the image allows it to boot faster. - env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} clean -y -a - env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg - rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports - rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports-kmods + if [ -z "${NO_ROOT}" ]; then + # The firstboot_pkgs rc.d script will download the repository + # catalogue and install or update pkg when the instance first + # launches, so these files would just be replaced anyway; + # removing them from the image allows it to boot faster. + pkg -c ${DESTDIR} clean -y -a + pkg -c ${DESTDIR} delete -f -y pkg + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports + rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports-kmods + fi # Vagrant instances use DHCP to get their network configuration. echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf @@ -40,8 +42,7 @@ vagrant_common () { # Create the vagrant user with a password of vagrant /usr/sbin/pw -R ${DESTDIR} \ groupadd vagrant -g 1001 - chroot ${DESTDIR} mkdir -p /home/vagrant - /usr/sbin/pw -R ${DESTDIR} \ + /usr/sbin/pw -R ${DESTDIR} -M ${DESTDIR}/METALOG \ useradd vagrant \ -m -M 0755 -w yes -n vagrant -u 1001 -g 1001 -G 0 \ -c 'Vagrant User' -d '/home/vagrant' -s '/bin/csh' @@ -58,11 +59,11 @@ vagrant_common () { echo "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key" > ${DESTDIR}/home/vagrant/.ssh/authorized_keys echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN1YdxBpNlzxDqfJyw/QKow1F+wvG9hXGoqiysfJOn5Y vagrant insecure public key" >> ${DESTDIR}/home/vagrant/.ssh/authorized_keys chmod 600 ${DESTDIR}/home/vagrant/.ssh/authorized_keys - metalog_add_data ./home/vagrant/.ssh/authorized_keys 0600 chmod 700 ${DESTDIR}/home/vagrant/.ssh chown -R 1001 ${DESTDIR}/home/vagrant/.ssh - echo "./home/vagrant/.ssh type=dir uid=1001 gid=1001 mode=0700" >> METALOG + echo "./home/vagrant/.ssh type=dir uid=1001 gid=1001 mode=0700" >> ${DESTDIR}/METALOG + echo "./home/vagrant/.ssh/authorized_keys type=file uid=1001 gid=1001 mode=0600" >> ${DESTDIR}/METALOG # Reboot quickly, Don't wait at the panic screen echo 'debug.trace_on_panic=1' >> ${DESTDIR}/etc/sysctl.conf