From nobody Fri Jun 26 14:40:17 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 4gmyyB11Zgz6jb9Z for ; Fri, 26 Jun 2026 14:40:18 +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 4gmyy962L3z3Wns for ; Fri, 26 Jun 2026 14:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782484817; 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=62jVXKssn2Iqcw/D2u9/tdU9B3KGe1ZOvQ99sClSgZ4=; b=i5Qj8MXyjy/uof6zsJqqhuEU5kEfBqtoIaeZkpbB+jAglw4k4NriN+SI5/lxWknUwCMBQe 32ig/q35RoTk+kuowODqKwmTXAGSeOzmQkRq2KUJhm8zgAQu1JlMGRmIHL3rpQ02fxwg2i QQmZfL4A0i+d02aCjYwEWDEl0kQJKcI+AXg4ly3EVSzndEwmOyw9ROOfSss08zrxJeSMas mX/En+X9QSZYunPUzzK1TLSW1DJmJd1LdX6Wx2DC8PGEdCZSXyzN5FnQDl0VjkK7ss1W3B NDgeQD+TXtnVLgGmGAJySasub4l40G0fvb7SKIe5cXe5xY+THbXaXxcMzmv5pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782484817; a=rsa-sha256; cv=none; b=Da1TjbvRsZEHy5ZSWYO3rK4rSRt9KCp9LKRqA/Q8v311zGlEpZQ343+r7gs3VG+Y4FfDEB mi0ER52d/eA8BJi8mebr7Z28ydPSgzEuI36hLQpBOJb40IRrILkKTo9CPkzOSQBQeeGYjC oIXtwV0vItIdMYo939oSBKCT7EzD+DnjjL2nbxboOgh7qmwCQVG/1XwL8q/wpsdeEYww1n DqyK9rkcuQU9no0p73OIzToFKUNpuKZXMTod11tbKRApO5W8GOfuIATO8FD4hdBLKzGWv6 Hreu9M9M49RSM5KnFplHeUbN9Bo1nJMRj8lz8hBoXABlA6ceCyxiMZajAndJdQ== 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=1782484817; 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=62jVXKssn2Iqcw/D2u9/tdU9B3KGe1ZOvQ99sClSgZ4=; b=Bw/TdiTWbaW6Gj30WvCVyaBdTM9DCsJwzfcSEvGa4Rp4UcLO+k3DMaRYWbT5Ob1yP13S1t L40ifTANAlDzcO4AWbiCQ1Ny2QMaNfeNjV4YqUNIA706WR6++ByQFzPzsVQucmEVfhugR3 O0nmHlR178H63AsMiCkg4qVO9BSBrU/N9ZffYm3PVG7YYSHihS7zflK7upZblkwf7OlmaJ GxL/LSTEOB9bMb/nyAMpd14gMBY9g1Dt4+hlqrGVs7I0b5YZR3j/dcjNd4RVkoDi6svX0Y +AapGOEegfbYMSQi9Zdqq5zFPWQSKf4jC+FV4+aoVE/ixJXCM7BO8g19t0PLiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmyy94Wcgzh5Z for ; Fri, 26 Jun 2026 14:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f40c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 14:40:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 45efa4e61623 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 45efa4e61623e3eeee7fd0a3f4436616e24c8e98 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 14:40:17 +0000 Message-Id: <6a3e8f51.1f40c.5dfe0c42@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=45efa4e61623e3eeee7fd0a3f4436616e24c8e98 commit 45efa4e61623e3eeee7fd0a3f4436616e24c8e98 Author: Dag-Erling Smørgrav AuthorDate: 2026-06-26 14:39:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-26 14:39:03 +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 --- 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)