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 DB02669DCB; Fri, 12 Mar 2021 13:54:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D7BA6329C0; Fri, 12 Mar 2021 13:53:38 +0100 (CET) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9B035329B1; Fri, 12 Mar 2021 13:53:37 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 62ACF422FE; Fri, 12 Mar 2021 13:53:37 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Fri, 12 Mar 2021 13:53:29 +0100 Message-Id: <20210312125329.20918-7-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210312125329.20918-1-f.ebner@proxmox.com> References: <20210312125329.20918-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.398 Adjusted score from AWL reputation of From: address KAM_ASCII_DIVIDERS 0.8 Spam that uses ascii formatting tricks 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [create.pm] Subject: [pve-devel] [PATCH/RFC container 6/6] restore: sanitize config: use new warn() function 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: Fri, 12 Mar 2021 12:54:08 -0000 to make it more visible when the task finished with warnings. Signed-off-by: Fabian Ebner --- Dependency bump for pve-common is needed. src/PVE/LXC/Create.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/PVE/LXC/Create.pm b/src/PVE/LXC/Create.pm index 82d7ad9..67b4c7a 100644 --- a/src/PVE/LXC/Create.pm +++ b/src/PVE/LXC/Create.pm @@ -6,6 +6,7 @@ use File::Basename; use File::Path; use Fcntl; +use PVE::RPCEnvironment; use PVE::Storage::PBSPlugin; use PVE::Storage; use PVE::DataCenterConfig; @@ -306,6 +307,8 @@ sub restore_configuration_from_proxmox_backup { sub sanitize_and_merge_config { my ($conf, $oldconf, $restricted, $unique) = @_; + my $rpcenv = PVE::RPCEnvironment::get(); + foreach my $key (keys %$oldconf) { next if $key eq 'digest' || $key eq 'rootfs' || $key eq 'snapshots' || $key eq 'unprivileged' || $key eq 'parent'; next if $key =~ /^mp\d+$/; # don't recover mountpoints @@ -316,12 +319,16 @@ sub sanitize_and_merge_config { if ($key eq 'lxc' && $restricted) { my $lxc_list = $oldconf->{'lxc'}; - warn "skipping custom lxc options, restore manually as root:\n"; - warn "--------------------------------\n"; + + my $msg = "skipping custom lxc options, restore manually as root:\n"; + $msg .= "--------------------------------\n"; foreach my $lxc_opt (@$lxc_list) { - warn "$lxc_opt->[0]: $lxc_opt->[1]\n" + $msg .= "$lxc_opt->[0]: $lxc_opt->[1]\n" } - warn "--------------------------------\n"; + $msg .= "--------------------------------"; + + $rpcenv->warn($msg); + next; } -- 2.20.1