From nobody Tue Jul 7 06:38:55 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 4gvWlh2JS9z6l1DF for ; Tue, 07 Jul 2026 06:38:56 +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 4gvWlg4STbz428Q for ; Tue, 07 Jul 2026 06:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783406335; 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=PHvqpFlj9k4LsFYjE9vDK7leRK14xdgDoHlxh2wNQO0=; b=o2FIygj/AKCNiUNrGEYZkf49qwO+dqbstIqTwqqThrboAw4VuxwpYjLXLJaIzn9d9dSvn/ IgC27c4cwHlsh5bsyptl52NenLjp+S4B7j2d/UqviX8fAxB8XKjyHPQkJvVtrUMb0lQDCG BO/IE2A8DNzv1iTiMm7zlITkQuaFWEtqggzRg/imsj9LpFbuFj1PVROddWhGfWelbEI1l7 GiT65mZkRGI86n6RUDotmrtKny7L2bJ63kwRm0zm88ZrAnjh51FMyrVxi90qpKD+eb8lZ2 xnqxrv7H5DdMNlsOH/IVI7YYtdU1tQ9h1zqw9lOePvB7M+osXxgtg2Hv3vfg2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783406335; a=rsa-sha256; cv=none; b=XNF0D/cITl+EvnO2cc5lK6Ec/lCCGfqnKGyRqyTc7dP05pXxTHExpoV4JVZeJkcBkfs6TU fn3R8uS49OpqSza8na6rVA/NXlOsLWL+HcKVzJjRYC0OXNy4Ve+JLEge52Ep65dD2XrTdt 3Py0CFSqgl/DQwhkVg8Ng9rl9Zo/5A2+Hkomora26ZfBb7B8kPwA/0nnR+oi6uMucikcXZ X5tfaPU1p2MXdMMq01+XymIqczPKoYV8sbsdtdk2vZvLZIFSDyCfXEJFmaABIH63hVT5Cb Tpuyebt+lBws1SAZCabDH4+WqNC5MUDprD9LHtDWPBitEd+6OBNRsEQeh3FneA== 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=1783406335; 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=PHvqpFlj9k4LsFYjE9vDK7leRK14xdgDoHlxh2wNQO0=; b=f0OgzHWFKOhymlFIaOFsx2k2MjtPqP1E0lc6XFv8D/2tMI7u4FJdoVjel+2X+J//7fDVvW lxmZwGe+7QHiS9mmh6xWrOdYZBklB8P9J09FxR2oYdfz4yFLllkfBSJT11QReWPgeAmBju 0sDnfU7f7v11cZnoS8NLkx+qyy+kUcybyvvpXjKvqjqY6iJkVBOQRahSyeSMfT/tJba2Y3 WLs7oGPQCWHuiPh6onhS9Xf5vqnk3z9j+AlSTZN2zkELY19CK/Hj74qY0/iG8AWI4TuESn 57frsPAvk9SaVQuswNcgF8SUefabnz1WKKXAEp8zriUaN7dQyiLkYu49TIZCPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gvWlg3L4cz88q for ; Tue, 07 Jul 2026 06:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32afb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Jul 2026 06:38:55 +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: 546b45645237 - stable/14 - rc.d/tmp: Fix dupe mount check 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 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/14 X-Git-Reftype: branch X-Git-Commit: 546b456452375dd27f10e6f7a3b39f6bc7254409 Auto-Submitted: auto-generated Date: Tue, 07 Jul 2026 06:38:55 +0000 Message-Id: <6a4c9eff.32afb.66c2a23b@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=546b456452375dd27f10e6f7a3b39f6bc7254409 commit 546b456452375dd27f10e6f7a3b39f6bc7254409 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-26 14:39:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-07 06:38:16 +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 bde1ba257c2c..5b46f96314a2 100755 --- a/libexec/rc/rc.d/tmp +++ b/libexec/rc/rc.d/tmp @@ -39,10 +39,15 @@ load_rc_config $name 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)