From nobody Sun Apr 12 03:16:30 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 4ftbKq1QyHz6YLh0 for ; Sun, 12 Apr 2026 03:16:31 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKp5fkFz3NxY for ; Sun, 12 Apr 2026 03:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963790; 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=MV3i3m0IA9xSE0yigD6VXpNIUhbQUiGQVch+oCO71/8=; b=W8+/gEvR0MRnPCm73hnZEZGbXUpNQUAVHWZbb5nb61slgSUgeq0fcZpaTudsFmJxYcpbC+ D0+mgGYgx/1eIq8ktNCyrrA01Otc6d2Z4WLG/lPi4AXVWBcpc/34LUySZj/RJQYKIJ8zQD +f4SvKptorxt8TNC5YmeQORMmM0S22/bgEPO5Z+70wSSkv2BqILhwf2uamjLEcnf+7dsZP +oy3GYkG8rOJBpzo85YBVEaiYgPCVp8ylI8cy5/ZZiR5KqS7koRxIDYQcayliaiN4bXQUg M/wje1e0yTKMWgB+noZ/ZyCwfRZPZHnuV1poHz7FkRxuf7zFFY3WBu64nqMHbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963790; a=rsa-sha256; cv=none; b=AF2Un33jBN/t6FCS9uOqW6r+6NRhuC6Y4bj0zbn/PYHEKR008wpFirWfAhG9blckIpA7L3 1nkNEb/m39xqAqRACkQjnr3oW1KhbmNWLHR1wBDtJ9IOlehjq5tOYHjUXmBBlMmL5t+gCs lSiBWrbfn9A22KUPMGwekIr07nP+1JZIKo/QkUO3hItshYTNuwA7YYde9x3wYGsQHLsBnE 2ZU28LlWIbYsLzVUTMA7GAwEKW8V58SdS1Veyt9uyYiOjKOQbm6tCyJBsmKQNAYBOCSDSk yL/g0eXChvj6o3sedNxlYGsuRKzBskWKm7BHmVXjJM4/X6IR6iOLz7CR26ErUg== 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=1775963790; 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=MV3i3m0IA9xSE0yigD6VXpNIUhbQUiGQVch+oCO71/8=; b=PuuonyyLdFzdpqZDKSV+qB3NIRzt6eQ9CiUlylI0vsT+F+535Y4gWNAQZR7GLgStTbV9nQ UQRHRLuAm7uOsckq5ACUyNHQZ07pjz6R/VLN9iILFy3G+HN4q4AMwxFZLkItz6SrHke9Bp QhskmpuffbGO0pmkSV1mhG1jZ0XsOUE0v22I5hKwQV8rHZ5T0cnukAxLI1/pxJwMNDHU4C FS1BGoChuG1hG8y9CRnHwohpCdaa4uNZxrnV5vKB5ATn43VIQex9Bg/dVy21AQIrU/ciDo 4v7c2V+ud0JWJcC12lg2WHWfBSHsWhXN9jbyqIjyM6BNxgCsiXZlgF5kLgyfrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKp4TQBzySq for ; Sun, 12 Apr 2026 03:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46bd2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: ebf890d48f51 - stable/15 - rc: run the zfs rc script before tmp 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ebf890d48f51615ffacd32b3ed5c154a51392754 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:30 +0000 Message-Id: <69db0e8e.46bd2.27e6b4f3@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ebf890d48f51615ffacd32b3ed5c154a51392754 commit ebf890d48f51615ffacd32b3ed5c154a51392754 Author: Kyle Evans AuthorDate: 2026-02-03 03:21:42 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:11 +0000 rc: run the zfs rc script before tmp The tmp rc script has much the same problem that the var does: it wants to test if /tmp is writable, and mount a tmpfs if it's not. This means that we actually want our zfs datasets mounted first, because we might have a /tmp dataset that changes the story. The ordering problem is particularly noticable with a r/o zfs root, since the write test will fail and we'll mount a tmpfs that later gets covered by our /tmp dataset. If that /tmp dataset inherited readonly, then we're still in trouble. This also fixes `tmpmfs=yes`, which would again get covered by a zfs dataset with the existing ordering. Reviewed by: des (cherry picked from commit d3f21856aa72c28408660ed40ce76bbd0716a991) --- libexec/rc/rc.d/zfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/zfs b/libexec/rc/rc.d/zfs index f88f65c2ec18..99156332e47b 100755 --- a/libexec/rc/rc.d/zfs +++ b/libexec/rc/rc.d/zfs @@ -4,7 +4,7 @@ # PROVIDE: zfs # REQUIRE: zfsbe -# BEFORE: FILESYSTEMS var +# BEFORE: FILESYSTEMS tmp var . /etc/rc.subr