From nobody Tue Jun 23 15:13:46 2026 X-Original-To: dev-commits-src-main@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 4gl7rC1TgDz6hZ82 for ; Tue, 23 Jun 2026 15:13:47 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl7rC0v3Yz466T for ; Tue, 23 Jun 2026 15:13:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782227627; 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=bMa3avXWdzUWi9Z+VP5ZwE1A5Xlc+v1KdGDoFEYlhzc=; b=JMbp3Y4OyFi1nvTPHji4tbo5YYBAoMYsCNq5lm1NPSDhryWGuS7Ev3hhW8T3U3TVtakRwP QEhc4X9PegLyvmqD9R2oUUmYSAdcbBSwhw6Un5BR7NNXiJPUNIXhMtanwsluoGolOhvnOW 1trMeq5oDlU9wyW/0YikzGij5m3+HGU+hqKnp3PGwTkJxCQs1N7IUYE1ww9q4HipnnEDk6 nOz+synClJgPLhw31YR4hu/wf1QDEg1MMiRkl4eoDaT01gUALoqD2uRzkmwjYzNAELjwvT 0SNU0KJeA+WAHrub442O9+3aEoHhYLGjslNdTSFfvkrwt0YYGqSKfnnT0XlrfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782227627; a=rsa-sha256; cv=none; b=qjNWnCX+0oHEbGhPvZKdB7op5NY/V6DQqPRI9j8yNP81kxcXsre/TW4SfNAzoCQLtLQSCD pOjzUVOWlDQJhN0umui9dCEV6CfQis/SbJt+ZhXGR/qlepOCDu1AZwTpT7A0HDKR3PLyGl J3pzFrdlKNMyyflqYVz0mCmoYa+gB0U17eAfbAQ42kC9W7MLgrKwvyGmEiVRq7W7m9lYmw DBAypkr8vFap56Wuh1P911Lhp94IAQvUBgXoqafMWuZ9/AVnFuuPaHuw1MdjkaVQFSYQ09 u7COqzljmMM4oencNRZ4+3Ntii3UwcGUcB6e87NUuuyTQJSOkOaYRs+AI0coAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782227627; 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=bMa3avXWdzUWi9Z+VP5ZwE1A5Xlc+v1KdGDoFEYlhzc=; b=c/nskhoZaVeD9l56+LZr8DrypLv6b1kHFE7g+wJgxctCJjaucF+IoBbY2ANwoMnS+8ax1f /vyg3HWUHzeTov6Kt0pua460qxmXt/2P3vC2xZn4BJKm1UnPBtVUfSLeWD7hBLMOQVza3t 1w9EeIuTaxA1XVvL4+W6irRkX6/t/gWyvH8BMhcFJsHlO53Lna5Nx7kfq43T/zEb/Dl6dg kQEZojAhreBY4LBKO0tfEDHm/CUZy5ood3RwFXXZvaOd1OeBRFP7EWtZC/jidr6seaHMpO JSAgaTD9Epnaeeu4hMWsB6V8R5TalrUn39PApSgMQRIuTOc6/0C3Qo/z7DbGAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl7rB6cqRzfrj for ; Tue, 23 Jun 2026 15:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e546 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 15:13:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Ambrisko Subject: git: 276a3dacdb60 - main - zfskeys - only prompt if zfskeys and zfskeys_prompt are enabled List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ambrisko X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 276a3dacdb60b65d65301aced5d8443cc5d27ea2 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 15:13:46 +0000 Message-Id: <6a3aa2aa.1e546.220a9a60@gitrepo.freebsd.org> The branch main has been updated by ambrisko: URL: https://cgit.FreeBSD.org/src/commit/?id=276a3dacdb60b65d65301aced5d8443cc5d27ea2 commit 276a3dacdb60b65d65301aced5d8443cc5d27ea2 Author: Doug Ambrisko AuthorDate: 2026-06-22 18:45:42 +0000 Commit: Doug Ambrisko CommitDate: 2026-06-23 15:12:43 +0000 zfskeys - only prompt if zfskeys and zfskeys_prompt are enabled By default don't block booting with a prompt if a zpool needs a keyboard password to unlock it. To enable prompting for keyboard password during boot require: zfskeys_enable="YES" zfskeys_prompt_enable="YES" to both be enabled. This returns to POLA of prior behaviour. PR: 296130 Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D57750 --- libexec/rc/rc.conf | 1 + libexec/rc/rc.d/zfskeys | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 27e8c8456b6f..6e70baccac98 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -77,6 +77,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 +zfskeys_prompt_enable="NO" # Set YES to prompt during booting zfs_bootonce_activate="NO" # Set YES to make successful bootonce BE permanent zpool_reguid="" # Set to zpools for which the GUID should be replaced # upon first boot. diff --git a/libexec/rc/rc.d/zfskeys b/libexec/rc/rc.d/zfskeys index aff0224d5c9d..af47f8737c13 100755 --- a/libexec/rc/rc.d/zfskeys +++ b/libexec/rc/rc.d/zfskeys @@ -20,6 +20,7 @@ required_modules="zfs" : ${zfskeys_datasets:=''} : ${zfskeys_timeout:=10} : ${zfskeys_unload_force:='NO'} +: ${zfskeys_prompt_enable:='NO'} encode_args() { @@ -45,13 +46,14 @@ unlock_fs() local kl="$2" local k="${kl##file://}" - if [ "$kl" == "prompt" ] - then - echo "Key prompt for $fs." - if zfs load-key -L "$kl" "$fs" < /dev/tty > /dev/tty 2>/dev/tty ; then - echo "Key loaded for $fs." - else - echo "Key failed to load for $fs." + if [ "$kl" == "prompt" ]; then + if checkyesno zfskeys_prompt_enable ; then + echo "Key prompt for $fs." + if zfs load-key -L "$kl" "$fs" < /dev/tty > /dev/tty 2>/dev/tty ; then + echo "Key loaded for $fs." + else + echo "Key failed to load for $fs." + fi fi elif [ "$k" ] && [ -f "$k" ] && [ -s "$k" ] && [ -r "$k" ]; then if [ "$(zfs get -Ho value keystatus "$fs")" = 'available' ]; then