From nobody Sun Feb 20 15:56:12 2022 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 401D319DEE8E; Sun, 20 Feb 2022 15:56:13 +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 4K1qmD6hlRz3lfd; Sun, 20 Feb 2022 15:56:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645372573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mo0ZNuaF9uX3iqKQGbxkzYGvsZBthY0L59AfJZw4PHs=; b=mnvYl9UpipybS8ei/OwiiarH3TQTgv6jv0p8wKBOTxWwHQ6iVAJ6v2Lr2wC3+21KFHVVnY L4RwplfWUno0+YSPoN5wsX71frx43NzrGh/aaGMRzH+8ISaZ4645lhIM1X5ifz2yiYAl87 Rp8d7XZkiBJq0bLw/koSMScrj1FmVvD9Z2UbUQkyhbzqv1NAslFK1YkJzhtaRNgWXFL052 sOsVq5BKY3vnWNBaMMO2Fc+9k+UpMeGoto1cJ5yZ+/St6gD6A6MmcFRGQU7bJo6mKNoi3S Oh25zuvizWqf/bhTm87DCHN+yVEjIOfY9hxMqbPjfGLWuKH60eThXuiWdl+isw== 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 AEC491F3C0; Sun, 20 Feb 2022 15:56: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 21KFuC6r031750; Sun, 20 Feb 2022 15:56:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KFuCp3031749; Sun, 20 Feb 2022 15:56:12 GMT (envelope-from git) Date: Sun, 20 Feb 2022 15:56:12 GMT Message-Id: <202202201556.21KFuCp3031749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 73f55c5a38bf - stable/13 - etc/defaults/rc.conf: set default of zfskeys_enable to NO 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 73f55c5a38bfbd22b5333421f23a9a19a11f7cb6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645372573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mo0ZNuaF9uX3iqKQGbxkzYGvsZBthY0L59AfJZw4PHs=; b=BH8OT4079SrEzit1k2NzFbMMlhmIUiVtlAHAV8JdUOTS1bOu4l+sTKYgtrwBvNVBshdlOP v9ziDvkpcNq0/3Jc2IlYa6GmNqBhgy/Qf0iKGwN8oYjjagC4UDnBPxcyjTXiBuOVwFraDF w6z0GmSX9Iw4SozGF0qco9zBroFlCm1ZyTE4ZKHGS6lVhMaZ0ZwxUuv8rD0hudMh+/EqUN RFNBf6XKrufog3QNSF8kXxRQI7GTeYoXvghmUQ1i5hg4JPhZmmAXzv56Ac2FoZFhZYB2b+ TqUFXXXUnxogFIOsNyQTOWemod4pQValveL5jw9aGvk5P5gOc6OKbZw2LMQkFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645372573; a=rsa-sha256; cv=none; b=kaEmLSYHmFLHOn6rfGvbOtvB34XCT09EAgNF+fEHBrA2aEge4jhfdL0va0QB67AKIsC2Nk 1jgwRfrQfcWh48KlyDHKKVFa2+uEWZ51QK/iX7s7SSjG6J44qJMG976V+1HF5pLQyt0A1X 82xYwZx11UFbkGYctcKa4TnklFTJKrlHhpbGvU3B/WDRSZ38KFCAvSv9HwfFQ2GbjlCLOZ Df4NsxbIApThy4MuuuqWdEpmswcIbqlktabsN37cwuQXQTGhIqdQaEc1l8R2U9kovu+p3d 8FIgWWhterR7R2LC1CnB6WwykdLPLnfzkMQdKmBBUM7axiX1HlkAGAnmSRsXaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=73f55c5a38bfbd22b5333421f23a9a19a11f7cb6 commit 73f55c5a38bfbd22b5333421f23a9a19a11f7cb6 Author: Robert Wing AuthorDate: 2022-01-18 23:26:30 +0000 Commit: Dimitry Andric CommitDate: 2022-02-20 15:53:27 +0000 etc/defaults/rc.conf: set default of zfskeys_enable to NO This addresses the following boot message: /etc/rc: WARNING: $zfskeys_enable is not set properly - see rc.conf(5). Reported by: Mark Millard Sponsored by: Modirum MDPay Sponsored by: Klara Inc. Fixes: bfb7a31b6a22 ("rc: Hook zfskeys to the build") Fixes: 33ff39796ffe ("Add zfskeys rc.d script for auto-loading encryption keys") (cherry picked from commit 6596f19daa42d5b968030e08826542c704533b73) --- libexec/rc/rc.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index c6f1a4d2b9c4..f3fb3fd9473c 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -67,6 +67,7 @@ rc_conf_files="/etc/rc.conf /etc/rc.conf.local" # ZFS support zfs_enable="NO" # Set to YES to automatically mount ZFS file systems +zfskeys_enable="NO" # Set YES to autoload ZFS encryption keys zfs_bootonce_activate="NO" # Set YES to make successful bootonce BE permanent # ZFSD support