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 D2F246B7B6 for ; Wed, 4 Aug 2021 12:51:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A33931E315 for ; Wed, 4 Aug 2021 12:51:14 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id D32F11E2E6 for ; Wed, 4 Aug 2021 12:51:12 +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 9912742DA5 for ; Wed, 4 Aug 2021 12:51:12 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 4 Aug 2021 12:51:09 +0200 Message-Id: <20210804105111.183355-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210804105111.183355-1-d.csapak@proxmox.com> References: <20210804105111.183355-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.477 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 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 container v2 3/3] skip features when restoring an unprivileged container as privileged 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: Wed, 04 Aug 2021 10:51:44 -0000 Signed-off-by: Dominik Csapak --- src/PVE/LXC/Create.pm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/PVE/LXC/Create.pm b/src/PVE/LXC/Create.pm index e8233b6..eea7c0d 100644 --- a/src/PVE/LXC/Create.pm +++ b/src/PVE/LXC/Create.pm @@ -320,6 +320,11 @@ sub sanitize_and_merge_config { # storage supports creating a template there next if $key =~ /^template$/; + if ($restricted && $key eq 'features' && !$conf->{unprivileged} && $oldconf->{unprivileged}) { + warn "changing from unprivileged to privileged, skipping features\n"; + next; + } + if ($key eq 'lxc' && $restricted) { my $lxc_list = $oldconf->{'lxc'}; warn "skipping custom lxc options, restore manually as root:\n"; -- 2.30.2