From nobody Tue Jul 7 06:38:47 2026 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 4gvWlX2Bbzz6l0xS for ; Tue, 07 Jul 2026 06:38:48 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gvWlW5s1nz4212 for ; Tue, 07 Jul 2026 06:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783406327; 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=fxNPO0QVN0VXcfEWVIBTnFjeXraFvOyPl1tfq19GTwA=; b=ihq9szwxYZUXtEDbz2NF3PD3CZ6I5+M5hWIhE2QfB7opLIkVZ6iNL6KhxrjlBRcrLg/ugn RDBC7p+IKY0JJKqAHiWSZxUmHZnN/3n/RPOR5K+SwufifuTzMFQAxHJLeflrATExXj34Se 6o5QoK5UjypAQWZaOc7P8qPOvZ1dZN98PN0GPxoM+TFqiAvaq7vuSGPP9hTKviachWSzP9 h+a4JMAkMAd8MgIatkzOLDe7lLT1VSLKKxgMLrf31IWq9mrK5KWo9p4aINki/h4PvO7dru WcglQLvM5oDeTrQLcQnq3LQvYY7zDsas8iqkl4Pl0vz74A79jcPrqGaEf9CPCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783406327; a=rsa-sha256; cv=none; b=MOrCgomNonb+2Krjo9+p5IBog7dD45i7PtnR8Y3i3qa6pKuJfeOGZD2x7zZmQ7hOxzmmMv qJ1KoReAX40nRzVMycw5bNDVF8j90ZCE52Dvrv00bunUNYd5TYbyFPppxbeMdkdC/VYnAq AeUlO8E4hQ/CqgwVR9eW99PFLh1iNUKxKLwI6Buh+0x+vFmvrZHWiQD6iWy7qAh0+fLqku tnszc9UR9mkKmHhALWhOFDJ/00nVT5oJWgVFimPuN+u/QOsN3lj9fHdnKuFdi61YlX5jqc 8uMJnknFGqMS9+t8ALU+kyYdd8YLj6zUUzQkYtfsfBgCnESm0A6GuAEOtaaDhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783406327; 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=fxNPO0QVN0VXcfEWVIBTnFjeXraFvOyPl1tfq19GTwA=; b=TKaJZv9K0HWDZ3H2sCfLu4tA2+segj+QNwIQmckkdZ6uCSqC7NoeW2qLICvyzFP4Iv/0vb pRXMBHKPKfkvN/VV13fQ8fCw/ArtU9eHwDWvbIZr8fK10RDTbaGTYuTcOQCf3WyvjxcCRh kwXrx8qJ4gHhW8dxMta5fce7cJKXESpzpnVWapNqV31bUt9+VLjPBHofcOWuf7QW/PW3rj 9h1RrBxw1/wzxa4PB0BBGRTYjStyatZ45C36BXg/1eW/gHYPfZTG2wFRdsiod2+d7Jerfp aeRYR7IeVqo/3WRNEt64bCQvyD8bTmGppFj0OLsFY4hZx05wwZFIOrB93PhlPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gvWlW4fFWz86X for ; Tue, 07 Jul 2026 06:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35efb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Jul 2026 06:38:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 7d350f5fd5d8 - stable/15 - rc.d/tmp: Fix dupe mount check 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7d350f5fd5d8d0abfc177d00a0c8c78cdef99fb9 Auto-Submitted: auto-generated Date: Tue, 07 Jul 2026 06:38:47 +0000 Message-Id: <6a4c9ef7.35efb.3ca9beb0@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7d350f5fd5d8d0abfc177d00a0c8c78cdef99fb9 commit 7d350f5fd5d8d0abfc177d00a0c8c78cdef99fb9 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-26 14:39:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-07 06:38:11 +0000 rc.d/tmp: Fix dupe mount check Before mounting a new mfs on /tmp, we check if there already is one. However, the dupe check only takes /dev/md[0-9]* into account, while the default mfs type these days is tmpfs. Rewrite it to look for tmpfs as well. Note that the dupe check is redundant in the tmpmfs=auto case, but we leave moving it for later. PR: 182035 MFC after: 1 week Reviewed by: kevans, allanjude Differential Revision: https://reviews.freebsd.org/D57682 (cherry picked from commit 45efa4e61623e3eeee7fd0a3f4436616e24c8e98) --- libexec/rc/rc.d/tmp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libexec/rc/rc.d/tmp b/libexec/rc/rc.d/tmp index cc970816e45c..76baaa672c6a 100755 --- a/libexec/rc/rc.d/tmp +++ b/libexec/rc/rc.d/tmp @@ -42,10 +42,15 @@ tmp_svcj="NO" mount_tmpmfs() { - while read line; do - case $line in - /dev/md[0-9]*\ /tmp) - return;; + while read _dev _ _ _ _ _mp; do + case ${_mp} in + /tmp) + case ${_dev} in + tmpfs|/dev/md[0-9]*) + return 0 + ;; + esac + ;; esac done <<*EOF $(df /tmp)