From nobody Sat Jun 14 06:29:06 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 4bK5vT2Dxvz5VqKJ; Sat, 14 Jun 2025 06:29:09 +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 4bK5vS6whCz4NBt; Sat, 14 Jun 2025 06:29:08 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id Q7K3uKk1S5MqyQKO4uN5ZX; Sat, 14 Jun 2025 06:29:08 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id QKO2unGwdWX70QKO3utb05; Sat, 14 Jun 2025 06:29:08 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=d71WygjE c=1 sm=1 tr=0 ts=684d16b4 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=YxBL1-UpAAAA:8 a=uWdJWRGJ4nZafTbHZh0A:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 498FF874; Fri, 13 Jun 2025 23:29:06 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 169EA113; Fri, 13 Jun 2025 23:29:06 -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: <202506131548.55DFmqnu004627@gitrepo.freebsd.org> References: <202506131548.55DFmqnu004627@gitrepo.freebsd.org> Comments: In-reply-to Warner Losh message dated "Fri, 13 Jun 2025 15:48:52 +0000." 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:29:06 -0700 Message-Id: <20250614062906.169EA113@slippy.cwsent.com> X-CMAE-Envelope: MS4xfIXwBE365SFZAXGffKb3S6ZyrGDbrkUKJ8tKhJ/INQTOFcQRukMTDM79JleOUKIXGQxuXDH/bKlnlXpcW9Dg33HoNitdfJ8h1SyBGsYQvFAPhUbKEEPx nqwPDw2nNWZ0SQ2JbbRzagOpKxOQ8vsqPRtfiOicYS7GcdqIZsS6peEqLjmEu/7RV+XxbvhKu4PpOfIyBr/frZuJgdkoHr8PiMVS0q6Br9mU0evwH3o52D3w gNyA7bmSFyZdyhae5ASKqkhwj739exoMrkT3nKhEy5udPu/R689e6AX/p+4mbGYrCncWTYV7sRPfDtkN3tqXXjeld0RCEKws8EbEnjaifzU= X-Rspamd-Queue-Id: 4bK5vS6whCz4NBt 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:16509, ipnet:3.96.0.0/15, country:US] 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=900bc0206348a439b3a0625a7239cb87 > 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. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0