From owner-svn-src-head@freebsd.org Fri Sep 4 23:36:44 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B73E33D3036; Fri, 4 Sep 2020 23:36:44 +0000 (UTC) (envelope-from delphij@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BjvG44FLHz4lLv; Fri, 4 Sep 2020 23:36:44 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 70895144D7; Fri, 4 Sep 2020 23:36:44 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 084NaiLe092375; Fri, 4 Sep 2020 23:36:44 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 084Naigg092373; Fri, 4 Sep 2020 23:36:44 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <202009042336.084Naigg092373@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 4 Sep 2020 23:36:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365348 - head/libexec/rc/rc.d X-SVN-Group: head X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: head/libexec/rc/rc.d X-SVN-Commit-Revision: 365348 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2020 23:36:44 -0000 Author: delphij Date: Fri Sep 4 23:36:43 2020 New Revision: 365348 URL: https://svnweb.freebsd.org/changeset/base/365348 Log: Make zpool on GELI work again. After OpenZFS import, zpool auto import behavior was moved to an explicit "zpool import -a", and the zpool rc.d script was added as a prerequisite of zvol. However, in r299839, zvol was added as a prerequisite of dumpon, making it to start very early and before all 'disks' providers. At this time, dumping on a zvol is not supported, so remove this requirement and make zpool depend on disks to allow zpool on full disk encryption work. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D26333 Modified: head/libexec/rc/rc.d/zpool head/libexec/rc/rc.d/zvol Modified: head/libexec/rc/rc.d/zpool ============================================================================== --- head/libexec/rc/rc.d/zpool Fri Sep 4 22:25:14 2020 (r365347) +++ head/libexec/rc/rc.d/zpool Fri Sep 4 23:36:43 2020 (r365348) @@ -4,7 +4,7 @@ # # PROVIDE: zpool -# REQUIRE: hostid +# REQUIRE: hostid disks # BEFORE: zvol mountcritlocal # KEYWORD: nojail Modified: head/libexec/rc/rc.d/zvol ============================================================================== --- head/libexec/rc/rc.d/zvol Fri Sep 4 22:25:14 2020 (r365347) +++ head/libexec/rc/rc.d/zvol Fri Sep 4 23:36:43 2020 (r365348) @@ -5,7 +5,6 @@ # PROVIDE: zvol # REQUIRE: zpool -# BEFORE: dumpon # KEYWORD: nojail . /etc/rc.subr