From nobody Sun Jun 15 14:21: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 4bKwL069tXz5VjhK; Sun, 15 Jun 2025 14:21:28 +0000 (UTC) (envelope-from SRS0=lH6/=Y6=klop.ws=ronald-lists@realworks.nl) Received: from smtp-relay-int-backup.realworks.nl (smtp-relay-int-backup.realworks.nl [87.255.56.188]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4bKwL048JXz3T1N; Sun, 15 Jun 2025 14:21:28 +0000 (UTC) (envelope-from SRS0=lH6/=Y6=klop.ws=ronald-lists@realworks.nl) Authentication-Results: mx1.freebsd.org; none Received: from smtp-relay-int-backup.realworks.nl (crmpreview6.colo2.realworks.nl [10.2.52.36]) by mailrelayint1.colo2.realworks.nl (Postfix) with ESMTP id 4bKwKr5T1qzcd; Sun, 15 Jun 2025 16:21:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=klop.ws; s=rw2; t=1749997280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to; bh=AY82MxxmfY0lV818jqUjaK9wTifLDF2Ms3GingOmqOM=; b=zkCEsRdnBGRnLqqgoxdgpUk7CUJ00VayTVin/E07BgbHlf39GePYc4IARLCv7rWPfysyWw lA1YyKzmR+rJ/6p+xB4JYiLDlGIFRsMB77o9IBvxoxOW45NMEmaYA3y/vZAXLnQGTxsQAE HwoNAvClHQj4WA1gOCOTjqmzvRCiwmkiz4pTtVG39uyNvbm5VxUeuNOYxKRdN3bOiR14tY +qhAGLuCaoMjNKHpeuEbEw9jdvpnMS6xlyUPXXOY8jSHGur/+o1OlNt+H9ERsTm5u5wMM5 uYWavCsdPlIcpzvKXbiCYMGqjDKbmyLA7tYuzdzSW/Gz3AiluGjkz+KA+JKkUg== Received: from crmpreview6.colo2.realworks.nl (localhost [127.0.0.1]) by crmpreview6.colo2.realworks.nl (Postfix) with ESMTP id AC54D20004D; Sun, 15 Jun 2025 16:21:20 +0200 (CEST) Date: Sun, 15 Jun 2025 16:21:20 +0200 (CEST) From: Ronald Klop To: Cy Schubert Cc: dev-commits-src-main@FreeBSD.org, dev-commits-src-all@FreeBSD.org, src-committers@FreeBSD.org Message-ID: <240137891.21754.1749997280448@localhost> In-Reply-To: <202506150508.55F58KLU008592@gitrepo.freebsd.org> Subject: Re: 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: multipart/alternative; boundary="----=_Part_21753_1823422774.1749997280446" X-Mailer: Realworks (753.34) X-Originating-Host: from (localhost [127.0.0.1]) by crmpreview6.colo2.realworks.nl [10.2.52.36] with HTTP; Sun, 15 Jun 2025 16:21:20 +0200 Importance: Normal X-Priority: 3 (Normal) X-Rspamd-Queue-Id: 4bKwL048JXz3T1N X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:38930, ipnet:87.255.32.0/19, country:NL] ------=_Part_21753_1823422774.1749997280446 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Van: Cy Schubert Datum: 15 juni 2025 07:08 Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Onderwerp: git: b6e33f0cd536 - main - rc.d/mountcritlocal: Make sure zpools are imported for legacy ZFS > > > 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' > > > > > Does this mean that a comment # must always be folllowed by a whitespace? Regards, Ronald ------=_Part_21753_1823422774.1749997280446 Content-Type: text/html; charset=us-ascii Content-Transfer-Encoding: 7bit

Van: Cy Schubert <cy@FreeBSD.org>
Datum: 15 juni 2025 07:08
Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Onderwerp: git: b6e33f0cd536 - main - rc.d/mountcritlocal: Make sure zpools are imported for legacy ZFS

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'



Does this mean that a comment # must always be folllowed by a whitespace?

Regards,
Ronald
------=_Part_21753_1823422774.1749997280446--