From owner-dev-commits-src-all@freebsd.org Mon Sep 20 05:26:12 2021 Return-Path: Delivered-To: dev-commits-src-all@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 ED247678658; Mon, 20 Sep 2021 05:26:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HCY1w63LYz3sL4; Mon, 20 Sep 2021 05:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B05102AC4; Mon, 20 Sep 2021 05:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18K5QC6H021731; Mon, 20 Sep 2021 05:26:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18K5QCtn021730; Mon, 20 Sep 2021 05:26:12 GMT (envelope-from git) Date: Mon, 20 Sep 2021 05:26:12 GMT Message-Id: <202109200526.18K5QCtn021730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 6f62e3a719bd - main - The linux rc.d script mounts several filesystems related to Linux ABI compatibility layer. When /compat is located on a ZFS other than /, mount would fail because they were not mounted. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f62e3a719bdaba2a1ccdafe4e3a810217aea817 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Sep 2021 05:26:13 -0000 The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=6f62e3a719bdaba2a1ccdafe4e3a810217aea817 commit 6f62e3a719bdaba2a1ccdafe4e3a810217aea817 Author: Xin LI AuthorDate: 2021-09-20 05:25:23 +0000 Commit: Xin LI CommitDate: 2021-09-20 05:25:26 +0000 The linux rc.d script mounts several filesystems related to Linux ABI compatibility layer. When /compat is located on a ZFS other than /, mount would fail because they were not mounted. Solve this by moving `linux` to depend on `zfs` which mounts all ZFS filesystems. Differential Revision: https://reviews.freebsd.org/D31848 MFC after: 2 weeks --- libexec/rc/rc.d/linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/linux b/libexec/rc/rc.d/linux index 23cb5acc6f99..fd3e3d902709 100755 --- a/libexec/rc/rc.d/linux +++ b/libexec/rc/rc.d/linux @@ -4,7 +4,7 @@ # # PROVIDE: linux -# REQUIRE: kldxref +# REQUIRE: kldxref zfs # KEYWORD: nojail . /etc/rc.subr