From nobody Sat Jun 14 06:35:51 2025 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 4bK63G3Kprz5pf1r; Sat, 14 Jun 2025 06:35:54 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta004.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bK63F6k8Zz3CbM; Sat, 14 Jun 2025 06:35:53 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of cy.schubert@cschubert.com designates 3.97.99.33 as permitted sender) smtp.mailfrom=cy.schubert@cschubert.com; dmarc=permerror reason="p tag has invalid value: quarantine rua=mailto:p[ostmaster@cschubert.com" header.from=cschubert.com (policy=permerror) Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id QDlZuL8Gw5MqyQKUbuN6tC; Sat, 14 Jun 2025 06:35:53 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id QKUauzKS1JhBPQKUbuhoWp; Sat, 14 Jun 2025 06:35:53 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=QY3Fvdbv c=1 sm=1 tr=0 ts=684d1849 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=6IFa9wvqVegA:10 a=6I5d2MoRAAAA:8 a=NEAV23lmAAAA:8 a=EkcXrb_YAAAA:8 a=VxmjJ2MpAAAA:8 a=YxBL1-UpAAAA:8 a=p_swzlC-Ip9MJO2sFL4A:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=7gXAzLPJhVmCkEl4_tsf:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id CE9A087F; Fri, 13 Jun 2025 23:35:51 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id C8C40302; Fri, 13 Jun 2025 23:35:51 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Warner Losh cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 900bc0206348 - main - rc.d/zpool: change mountcritlocal dep from BEFORE to REQUIRE In-reply-to: <20250614062906.169EA113@slippy.cwsent.com> References: <202506131548.55DFmqnu004627@gitrepo.freebsd.org> <20250614062906.169EA113@slippy.cwsent.com> Comments: In-reply-to Cy Schubert message dated "Fri, 13 Jun 2025 23:29:06 -0700." 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=us-ascii Date: Fri, 13 Jun 2025 23:35:51 -0700 Message-Id: <20250614063551.C8C40302@slippy.cwsent.com> X-CMAE-Envelope: MS4xfOrwexDGAGwKTFd+W0SN8eQaTbJbtRD23JAXsIJnexwZdTFUA8/jMr0Mqf1/XXXrxYEiblZowLi2JFeNn2jrleCgfIAOqVr8PnCBibnreCJfWnywIdc6 U9ZOjdzYrAt/n466+/4xBZ9CCXNV1c7FPxiMME6AWz5fGz9iCjCx5ZH1AJTtlM68SpQgwKTnlDzTgvkr9AwuSqGSC+1V3jpVd9TnbBBOCzdcecHXYa87TKBS Hx4U+ABpou650NMMmKYO0uN2HRsjy0rr3KBP0E7oNeh6jcHbcmUfGlvU0FhwWcXVaC01bhH+Zrc2UL5Ufh/q7uWujLoP18REAfdNva76wMU= X-Spamd-Result: default: False [-1.04 / 15.00]; NEURAL_HAM_SHORT(-0.99)[-0.991]; NEURAL_HAM_MEDIUM(-0.98)[-0.978]; NEURAL_SPAM_LONG(0.83)[0.826]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:3.97.99.32/31]; RCVD_IN_DNSWL_LOW(-0.10)[3.97.99.33:from]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; REPLYTO_EQ_FROM(0.00)[]; DMARC_BAD_POLICY(0.00)[cschubert.com : p tag has invalid value: quarantine rua=mailto:p[ostmaster@cschubert.com]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org,dev-commits-src-all@freebsd.org]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4bK63F6k8Zz3CbM X-Spamd-Bar: - In message <20250614062906.169EA113@slippy.cwsent.com>, Cy Schubert writes: > In message <202506131548.55DFmqnu004627@gitrepo.freebsd.org>, Warner Losh > write > s: > > The branch main has been updated by imp: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=900bc0206348a439b3a0625a7239cb > 87 > > a2dc27c5 > > > > commit 900bc0206348a439b3a0625a7239cb87a2dc27c5 > > Author: Siva Mahadevan > > AuthorDate: 2025-03-14 15:52:12 +0000 > > Commit: Warner Losh > > CommitDate: 2025-06-13 15:47:25 +0000 > > > > rc.d/zpool: change mountcritlocal dep from BEFORE to REQUIRE > > > > In cases where the `/boot` directory is mounted from a different disk, > > `/boot/zfs/zpool.cache` will not be found during a `rc.d/zpool` > > run. This is because `/etc/fstab` mounts are mounted in > > `rc.d/mountcritlocal`, which currently runs AFTER (i.e. `REQUIRE:`) > > `rc.d/zpool`. > > > > This change swaps the `rcorder` of `rc.d/zpool`'s dependency on > > `mountcritlocal` from `BEFORE:` to `REQUIRE:`. This will ensure that > > `/boot` (or even `/etc/` in some configurations) to be visible while > > searching for `zpool.cache`. > > > > Reviewed by: imp > > Pull Request: https://github.com/freebsd/freebsd-src/pull/1614 > > Closes: https://github.com/freebsd/freebsd-src/pull/1614 > > --- > > libexec/rc/rc.d/zpool | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/libexec/rc/rc.d/zpool b/libexec/rc/rc.d/zpool > > index 94e107bd9ae0..63f040ad122b 100755 > > --- a/libexec/rc/rc.d/zpool > > +++ b/libexec/rc/rc.d/zpool > > @@ -3,8 +3,7 @@ > > # > > > > # PROVIDE: zpool > > -# REQUIRE: hostid disks > > -# BEFORE: mountcritlocal > > +# REQUIRE: hostid disks mountcritlocal > > # KEYWORD: nojail > > > > . /etc/rc.subr > > > > This causes systems which boot off UFS with ZFS to fail boot. The machine > drops into single user until one can /etc/rc.d/zpool start and hit > control-d to continue the boot. > > The reason this fails is /etc/fstab with legacy ZFS will no longer boot > into multiuser. > > slippy$ grep zfs /etc/fstab | head > # tank/usr/lib/debug/amd64 /usr/lib/debug zfs rw,noatime > 0 0 > tank/sfw/modules /boot/modules zfs rw,noatime 0 0 > tank/sfw/local /usr/local zfs rw,noatime 0 0 > tank/sfw/compat /usr/compat zfs rw,noatime 0 0 > tank/sfw/var/lib /var/lib zfs rw,noatime 0 0 > tank/sfw/var/db/pkg /var/db/pkg zfs rw,noatime 0 0 > tank/sfw/var/db/ports /var/db/ports zfs rw,noatime 0 0 > tank/var/db/mysql /var/db/mysql zfs rw,noatime 0 0 > tank/db/pgsql /var/db/postgres zfs rw,noatime 0 0 > tank/var/db/local /var/db/local zfs rw,noatime 0 0 > slippy$ > > Please revert this. I left this comment in the pull request and reopened it. This causes systems with ZFS legacy filesystems, those specified in /etc/fstab to fail to enter multi-user because mountcritlocal cannot find fstyp zfs. BTW, this is the reason I specified BEFORE: mountcritlocal when I created this rc script. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0