From nobody Sun Jun 15 05:08:20 2025 X-Original-To: dev-commits-src-main@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 4bKh3n0c6Mz5q1KW; Sun, 15 Jun 2025 05:08:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bKh3m736jz4Nw2; Sun, 15 Jun 2025 05:08:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749964101; 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=K4rV8JNGz4yvCcVBIgITkfouFTfl2h3Fpomp/kH+l34=; b=J3f8j4TzBF1LS+abXo2xDMabeH64bfSfSbOs4l7lJAq45bBZkyTHa3g2f/chzWDzSIWxfe IAmZu64N6AiTO85iSwj2Pefrkup3PMdV45rnRki2OoUC/OdzFO2SWWFiKvVbVfgX35o7RN 2CvFEbWgfNtxPtvMCTc4nit9Ds3AbNLoVKVp5zEwvW0sDknQhG6tkJJjqeXQU/N3o/twFW 2dMIK1TgsFx3pRs6nmgW+wpW3aNW3zmqUBi2r+AztqwVtSL0V1OjNktrK0zrdYbR7moRUE 76qu9rUCoMYkrwm44t/r+2h9Pu0QLadFMYv7km9XmGZDGejWq8TxsxUzCUnngA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749964101; 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=K4rV8JNGz4yvCcVBIgITkfouFTfl2h3Fpomp/kH+l34=; b=VYlnAy4PfnYvhlQKMBLlVRUjBZ1zB8sbnmgm979uMm1OyP6VjKiuBvt8u+yXdxbFC5oEkS DILtMTYjl3kRGNAulnronZEKJCwuANEspuZ9FDuR424mIYNH2pwFZyN5AqdZ+dHk2ysO6R pw1ngFYstJNrLGkDpPMaK3u9XkspKXkheJQr52JcjJOvJznsw44eYtrYk3MlLMvAa/BTIp +97pwjiYQfElVhPbBb1HvlqMWT3+Y1CF7Q4JWGgsoRlKuU+EfTRsG/daQhnbGUyRt69ceR T9a0hsH6gqbBG/xTDVz4z9kXRFF2y9Rr66BsINhl0zXqAeq0HVXrTSwc7xXlFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749964101; a=rsa-sha256; cv=none; b=b5jX0SwN0sBbJnIMq9SpmnkAwyGnzbmRSos2O2m+uP8DzNKvd2BKLbbvOxFXggQ25DbUuA KNHiRL3HqGc4qgQv1wGiVYS5RpCrXqBdIF25r6Jzp+0cN3FFXBIt6agWntcGVww0cMPAlF A+MjpW6i/ujXDcEIYmzPlEUUJhKLNjFbR12bJ28F7U784JQOE/67KWE9QRHyRq3gqXjjPm QgH7nfAZDgoys+benWckd4F2BfytRrbGwJ4whoI7F3QGqe2VpzrpypXDdKaiAavCWEckyn A45n9cgggx0NNEJckAktUqIiFmVPT4U0EB+mW8UL3SCWKOHgLG8HDxPD0tS+ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bKh3m6b8lzyXl; Sun, 15 Jun 2025 05:08:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55F58Kgm008595; Sun, 15 Jun 2025 05:08:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55F58KLU008592; Sun, 15 Jun 2025 05:08:20 GMT (envelope-from git) Date: Sun, 15 Jun 2025 05:08:20 GMT Message-Id: <202506150508.55F58KLU008592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: b6e33f0cd536 - main - rc.d/mountcritlocal: Make sure zpools are imported for legacy ZFS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6e33f0cd53683e06570606d5bd88fc04a4b76fe Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=b6e33f0cd53683e06570606d5bd88fc04a4b76fe commit b6e33f0cd53683e06570606d5bd88fc04a4b76fe Author: Cy Schubert AuthorDate: 2025-06-14 13:16:16 +0000 Commit: Cy Schubert CommitDate: 2025-06-15 04:39:36 +0000 rc.d/mountcritlocal: Make sure zpools are imported for legacy ZFS Legacy ZFS uses fstab to mount its datasets. In an attempt to fix another problem 900bc0206348 broke legacy ZFS in fstab(5). This comit works around the problem by mountcritlocal scanning /etc/fstab for zfs mountpoint and if any are found invoke /etc/rc.d/zpool start. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D50844 --- libexec/rc/rc.d/mountcritlocal | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libexec/rc/rc.d/mountcritlocal b/libexec/rc/rc.d/mountcritlocal index f91eaf44457c..6dce672657fc 100755 --- a/libexec/rc/rc.d/mountcritlocal +++ b/libexec/rc/rc.d/mountcritlocal @@ -27,6 +27,15 @@ mountcritlocal_start() ;; esac + while read a b vfstype rest; do + if [ "$vfstype" = "zfs" -a "$a" != "#" ]; then + # zpool is needed for legacy ZFS + echo 'Importing zpools for legacy ZFS' + /etc/rc.d/zpool start + break + fi + done < /etc/fstab + # Mount everything except nfs filesystems. startmsg -n 'Mounting local filesystems:' mount_excludes='no'