From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CDAD4615C9 for ; Thu, 9 Jul 2020 10:25:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8DDE910657 for ; Thu, 9 Jul 2020 10:25:45 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 1812610646 for ; Thu, 9 Jul 2020 10:25:45 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D58FB44497 for ; Thu, 9 Jul 2020 10:25:44 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@pve.proxmox.com Date: Thu, 9 Jul 2020 10:25:44 +0200 Message-Id: <20200709082544.14550-3-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200709082544.14550-1-w.bumiller@proxmox.com> References: <20200709082544.14550-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH storage 3/3] pvesm: encryption key parameter should load files X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jul 2020 08:25:45 -0000 also `pvesm set` and `pvesm add` should behave the same with respect to how configuration options are treated Signed-off-by: Wolfgang Bumiller --- PVE/CLI/pvesm.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PVE/CLI/pvesm.pm b/PVE/CLI/pvesm.pm index 4f934d6..f223c92 100755 --- a/PVE/CLI/pvesm.pm +++ b/PVE/CLI/pvesm.pm @@ -36,9 +36,11 @@ sub param_mapping { return PVE::PTY::read_password("Enter Password: "); }, }); + my $mapping = { 'cifsscan' => [ $password_map ], - 'create' => [ $password_map ], + 'create' => [ $password_map, 'encryption_key' ], + 'update' => [ $password_map, 'encryption_key' ], }; return $mapping->{$name}; } -- 2.20.1