From nobody Sat Jan 17 18:12:56 2026 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 4dtlFP0xhDz6P3TX for ; Sat, 17 Jan 2026 18:12:57 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dtlFN6nYzz3nym for ; Sat, 17 Jan 2026 18:12:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768673577; 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=XANc25vMv3ltG6vu0HcBDwHVMCnVhLIYdHFWij0zYlg=; b=HS6BdxodLopVPLBnrWx3ho8yh/DMi9R8GxAhARiJbSykvaqnLLEGXvtt9Zvtzy7RLHGb0y /pCLZY8Kcyj7utPiVSUDGnCwMYgzn33jljdkl+w8QM7lRIrjVSM/wZVUZ5WqXh7EfJPxUW rjCDQLV2AJDRhIpngCH/ZELb42/5vxJOfQSYHjWenT7y8cgq6CUo82SQgufVyiV5tFv0Rq KkPfUhFc739Ui4xT3/vnCY6JwKmSeoB62cX/KupH80NYJqmDL/qUgIptd8OsRQjmPkKCn0 1rtgUPwXE6W76WD025bVZrhpzgCP4BzTrUBjaKs7IXYxeaB98vjsGpeqwDK0fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768673577; 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=XANc25vMv3ltG6vu0HcBDwHVMCnVhLIYdHFWij0zYlg=; b=Y6BIPEzYZrpCXrL6fH5ZYdRK31ieLM+zIHMfDS5kmCahyTtvnXTlp/8q2oQHb/n6Xyh2xZ Aqh1XI89i8vAtHhMnZfotBe9T6SNXHytz1wxPIPSUi+/Rq2h5k3c8FTpBi2zGv+V+maRrx 4vCttirPt9QAuA0hekDzppM3dDpb+7H4mXm6takHBv0AI5RZid2bGvVRK/3jUZ+NPZ4jsO Juj7pfPzkKUF8oStKFv3D8WHpTbQXupxkovsNQSCXYRU5FvgOL5/f5aoJqmbDr7y/PMo5M WTbjS60uyqlNiZuQTbh3+I0WCjwMKXpSBjiWL9MEx4eAm+qIPq0KWdG56Ziikw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768673577; a=rsa-sha256; cv=none; b=YtlwLfNTb9uXEAtoLCbg2D7quI5VLI4v8CFuEQxZhvq9cVT0itJ1pZyFvaNn1UUP7vTWpo IYXo+XarBS8zR262A9iph27LCdxWgoPXN6c2QdBp+jhh0TaA0f0ESw4kWqJTa7B/NjVQz4 AWJEzlLE8WMNv4J8F+t65HZurTT/b5Tci6HevvLZpz2v4kQzFVuqeKWt6LyuValOMTimWK ap933SWDN8c6xpSZGpGD9/bEJtg5ixUY+qCl6dKoLhPxXhuwuwbE2DEpEwF2nT6t2KT+W1 kS2nXn358bL2AET4iS2ZVpOmtYftjz9TOLw7tY/MGcyBtlAqqGd17qobcfUc5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dtlFN635Mz19SG for ; Sat, 17 Jan 2026 18:12:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b061 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 17 Jan 2026 18:12:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 7106db625ece - main - nanobsd: Prefer nano_umount to umount 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7106db625ece3cb48c5993686c74553993b9431a Auto-Submitted: auto-generated Date: Sat, 17 Jan 2026 18:12:56 +0000 Message-Id: <696bd128.3b061.7d379a0@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=7106db625ece3cb48c5993686c74553993b9431a commit 7106db625ece3cb48c5993686c74553993b9431a Author: Jose Luis Duran AuthorDate: 2026-01-17 18:03:00 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-17 18:03:00 +0000 nanobsd: Prefer nano_umount to umount nano_umount[^1] is a convenience routine used to override issues with umount(8) without changing the nanobsd.sh source code. There were a few places where it was not being used. [^1]: Introduced in 6d12b61a88a6 ("Add a routine for easy workaround any umount issues w/o hacking nanobsd.sh.") Reviewed by: imp, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48780 --- tools/tools/nanobsd/defaults.sh | 6 +++--- tools/tools/nanobsd/legacy.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 588758154c98..57be7a10f521 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -812,7 +812,7 @@ cust_pkgng() { mount -t nullfs -o noatime -o ro ${NANO_PACKAGE_DIR} ${NANO_WORLDDIR}/_.p mount -t devfs devfs ${NANO_WORLDDIR}/dev - trap "umount ${NANO_WORLDDIR}/dev; umount ${NANO_WORLDDIR}/_.p ; rm -xrf ${NANO_WORLDDIR}/_.p" 1 2 15 EXIT + trap "nano_umount ${NANO_WORLDDIR}/dev; nano_umount ${NANO_WORLDDIR}/_.p ; rm -xrf ${NANO_WORLDDIR}/_.p" 1 2 15 EXIT # Install pkg-* package CR "${PKGCMD} add /_.p/${_NANO_PKG_PACKAGE}" @@ -837,8 +837,8 @@ cust_pkgng() { CR0 "${PKGCMD} info" trap - 1 2 15 EXIT - umount ${NANO_WORLDDIR}/dev - umount ${NANO_WORLDDIR}/_.p + nano_umount ${NANO_WORLDDIR}/dev + nano_umount ${NANO_WORLDDIR}/_.p rm -xrf ${NANO_WORLDDIR}/_.p } diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh index cbe56d6f560c..5ba2d81c6017 100644 --- a/tools/tools/nanobsd/legacy.sh +++ b/tools/tools/nanobsd/legacy.sh @@ -113,7 +113,7 @@ create_code_slice() { -y ${NANO_HEADS}` fi - trap "echo 'Running exit trap code' ; df -i ${MNT} ; umount ${MNT} || true ; mdconfig -d -u $MD" 1 2 15 EXIT + trap "echo 'Running exit trap code' ; df -i ${MNT} ; nano_umount ${MNT} || true ; mdconfig -d -u $MD" 1 2 15 EXIT gpart create -s bsd "${MD}" gpart add -t freebsd-ufs -b 16 "${MD}"