Date: Fri, 26 Jun 2026 14:40:17 +0000 From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 45efa4e61623 - main - rc.d/tmp: Fix dupe mount check Message-ID: <6a3e8f51.1f40c.5dfe0c42@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=45efa4e61623e3eeee7fd0a3f4436616e24c8e98 commit 45efa4e61623e3eeee7fd0a3f4436616e24c8e98 Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2026-06-26 14:39:03 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> 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)home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a3e8f51.1f40c.5dfe0c42>