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 22A726E359 for ; Tue, 29 Mar 2022 14:53:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 448712E940 for ; Tue, 29 Mar 2022 14:53:34 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS id F026B2E8A9 for ; Tue, 29 Mar 2022 14:53:31 +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 BCBD645974 for ; Tue, 29 Mar 2022 14:53:31 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 29 Mar 2022 14:53:19 +0200 Message-Id: <20220329125324.120737-8-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220329125324.120737-1-f.ebner@proxmox.com> References: <20220329125324.120737-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.116 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [common.pm] Subject: [pve-devel] [PATCH v2 guest-common 1/1] vzdump: schema: add 'notes-template' and 'protected' properties 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: Tue, 29 Mar 2022 12:53:35 -0000 In command_line(), the notes-template string is printed, quoted, but otherwise as is, which is a bit ugly for multi-line notes. But it is part of the commandline, so print it. Signed-off-by: Fabian Ebner --- Changes from v1: * Rename parameter to notes-template and adapt description for new functionality. src/PVE/VZDump/Common.pm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/PVE/VZDump/Common.pm b/src/PVE/VZDump/Common.pm index 83d7413..84c97ba 100644 --- a/src/PVE/VZDump/Common.pm +++ b/src/PVE/VZDump/Common.pm @@ -233,7 +233,21 @@ my $confdesc = { type => 'string', description => 'Backup all known guest systems included in the specified pool.', optional => 1, - } + }, + 'notes-template' => { + type => 'string', + description => "Template string for generating notes for the backup(s). It can contain ". + "variables which will be replaced by their values. Currently supported are \$CLUSTER, ". + "\$GUESTNAME, \$NODE, and \$VMID, but more might be added in the future.", + requires => 'storage', + optional => 1, + }, + protected => { + type => 'boolean', + description => "If true, mark backup(s) as protected.", + requires => 'storage', + optional => 1, + }, }; sub get_confdesc { -- 2.30.2