From nobody Wed Sep 24 16:44:50 2025 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 4cX2kq1dgDz686k8; Wed, 24 Sep 2025 16:44:51 +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 4cX2kq0vmZz40Tq; Wed, 24 Sep 2025 16:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758732291; 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=KBbi0zuKA/CCp+WUfrr7SPvX+oqaZtyDUwi9kmLAJf8=; b=igDaUqSm4/38g6JOHv0Rx+FDJcjdDTDRBIhdJmbV9I/7fUf5rUv8yjlP0ryM8fcDF13laR E8qRcSc26q0/Cuw1g5vlf2v+d9cWmIaTtdhhp0P+LBvKjGikB+PwCMRz2PYS8ELsVz3ChA qmI3fU11R+WhUQasroypxtMf3CDbiZISJXHlegMkqGnVVGOmhW7QAFsZYCrKkNkkGrc1Xv w7K/vHXF3baHugevkgYLPuMP7vSIqn01CZigd0g9klmSZx4PV5VOaJmEj6CWkTYFBiqqS6 wU1wBsu/pvuO+oIfGueZ347Eavud03FFcEDQPQ2GgCoDEDvxzbMLKH/SbVwoLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758732291; 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=KBbi0zuKA/CCp+WUfrr7SPvX+oqaZtyDUwi9kmLAJf8=; b=W289oUNImufsKL8HGkgpYXq37v48x7FFWIfD7ecnXg+GBMZJLlNjpLyUDhpa4hsAXK0h4u Q3bDzzSacv9BiUlPrAaV4aZtwVdlh1rnxW6/sWphL3sCDstzLqTwuA72ockkFeHt5sKelE bmsfBD+eOmQNAqlOS8AQ1OlM7py1G0ItlsPtKBvVYXNB5cbchcsNvf0bOsD3Pa8Obw5enI YeJ1ZcTY6C5x3YrkjR+M5wf2jBT456TZLYjx+HH5sM6I+BbesoaBUmIE8b/p8gimWDQb1T sShBmHlOzlz87LRRYyNymscmqe5ispIhXGEefWJnwv6e3XtPC7J0cOGpbR6q5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758732291; a=rsa-sha256; cv=none; b=xus9ADphNScpvP6qXAa3thMyHu7wAn9ss+SHIunK69IU379/nSa0XtwTi/PcVgB6Txf3OZ iUePXhhNkQ0Jo28/7vsIuz8VX1M7lOvsi1fwrE7tOC/Y8AQJKFp41ubIdeRosKUQmi2IcR i3NOQ3LFxy1lkz8GHOgf9nhSyxr/EFU7iMoPH/X/OeYNOj8f+KMNdE3aTzYZrqRFZrsjRP 8h6eFtR7I7TH96ovzR+ygJMVKwRmBOC2W/c+u7nOxutQCxkY0qrrNmrKyQU8lirZOeEeAz Hz8glJzVZvWW7J+WcE2lUOrrOVohzzh/lvnoy1w4uBH94z9cPIbbSblZR+Fuig== 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 4cX2kq0VK5zgln; Wed, 24 Sep 2025 16:44:51 +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 58OGioHq048011; Wed, 24 Sep 2025 16:44:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58OGio1p048008; Wed, 24 Sep 2025 16:44:50 GMT (envelope-from git) Date: Wed, 24 Sep 2025 16:44:50 GMT Message-Id: <202509241644.58OGio1p048008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2352b89d2f73 - main - nanobsd: Fix regressions from last cleanup 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2352b89d2f732e3fa33fbd494267f0d4cb917e51 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2352b89d2f732e3fa33fbd494267f0d4cb917e51 commit 2352b89d2f732e3fa33fbd494267f0d4cb917e51 Author: Warner Losh AuthorDate: 2025-09-24 15:43:42 +0000 Commit: Warner Losh CommitDate: 2025-09-24 15:43:42 +0000 nanobsd: Fix regressions from last cleanup c99bb5747f5e changed ( ) grouping into { }, but in these cases we chdir and depended on the subshell not changing it for the caller. Restore the old behavior. It seems to work w/o this change, true, but the old code was intentionally like this. Fixes: c99bb5747f5e Sponsored by: Netflix --- tools/tools/nanobsd/defaults.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 4f0cc2fa99bd..588758154c98 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -253,13 +253,13 @@ nano_global_make_env() { # Create empty files in the target tree, and record the fact. All paths # are relative to NANO_WORLDDIR. # -tgt_touch() { +tgt_touch() ( cd "${NANO_WORLDDIR}" for i; do touch $i echo "./${i} type=file" >> ${NANO_METALOG} done -} +) # # Convert a directory into a symlink. Takes two arguments, the @@ -267,7 +267,7 @@ tgt_touch() { # directory is removed and a symlink is created. If we're doing # a nopriv build, then append this fact to the metalog # -tgt_dir2symlink() { +tgt_dir2symlink() ( local dir=$1 local symlink=$2 @@ -277,7 +277,7 @@ tgt_dir2symlink() { if [ -n "$NANO_METALOG" ]; then echo "./${dir} type=link mode=0777 link=${symlink}" >> ${NANO_METALOG} fi -} +) # run in the world chroot, errors fatal CR() { @@ -766,14 +766,14 @@ cust_allow_ssh_root() { ####################################################################### # Install the stuff under ./Files -cust_install_files() { +cust_install_files() ( cd "${NANO_TOOLS}/Files" find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)/' | cpio ${CPIO_SYMLINK} -Ldumpv ${NANO_WORLDDIR} if [ -n "${NANO_CUST_FILES_MTREE}" -a -f ${NANO_CUST_FILES_MTREE} ]; then CR "mtree -eiU -p /" <${NANO_CUST_FILES_MTREE} fi -} +) ####################################################################### # Install packages from ${NANO_PACKAGE_DIR}