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 480C26936E for ; Tue, 23 Feb 2021 15:19:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3CCDE1EE61 for ; Tue, 23 Feb 2021 15:19:30 +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 1526F1EE52 for ; Tue, 23 Feb 2021 15:19:29 +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 D46D7462E0 for ; Tue, 23 Feb 2021 15:19:28 +0100 (CET) To: pve-devel@lists.proxmox.com, o.bektas@proxmox.com References: <20210223122936.662855-1-o.bektas@proxmox.com> From: Fabian Ebner Message-ID: <661fc659-f655-0d12-51aa-71eeaa4c7989@proxmox.com> Date: Tue, 23 Feb 2021 15:19:28 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: <20210223122936.662855-1-o.bektas@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.000 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) 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. [lxc.pm] Subject: Re: [pve-devel] [PATCH v2 container] fix #3313: recover unprivileged bit from old config during pct restore 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, 23 Feb 2021 14:19:30 -0000 Works for me and also fixes the "template restore as non-root" issue that apparently nobody complained about. It was a bit confusing to think about $orig_mp_param, whose assignment is now also not guarded by $is_root anymore. But if $orig_mp_param is used, i.e. if we enter the if ($storage_only_mode) { if ($restore) { block, it's set by a second recover_config() call anyways, so that should be fine too. Reviewed-by: Fabian Ebner Tested-by: Fabian Ebner Am 23.02.21 um 13:29 schrieb Oguz Bektas: > since pct defaults to privileged containers, it restores the container > as privileged when `--unprivileged 1` is not passed. > > instead we should check the old configuration and retrieve it > from there. > > this way, when one creates an unprivileged container on GUI, it will be > still restored as unprivileged via pct (without having to pass > `--unprivileged 1` parameter) > > Signed-off-by: Oguz Bektas > --- > v1->v2: > * move the $is_root guard > * wrap line to make it shorter > * shorten comment > * use () around defined > * also check defined($orig_conf->{unprivileged}) > > > src/PVE/API2/LXC.pm | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm > index 8ce462f..3d3dbb0 100644 > --- a/src/PVE/API2/LXC.pm > +++ b/src/PVE/API2/LXC.pm > @@ -352,7 +352,7 @@ __PACKAGE__->register_method({ > my $orig_mp_param; # only used if $restore > if ($restore) { > die "can't overwrite running container\n" if PVE::LXC::check_running($vmid); > - if ($is_root && $archive ne '-') { > + if ($archive ne '-') { > my $orig_conf; > print "recovering backed-up configuration from '$archive'\n"; > ($orig_conf, $orig_mp_param) = PVE::LXC::Create::recover_config($storage_cfg, $archive, $vmid); > @@ -361,7 +361,11 @@ __PACKAGE__->register_method({ > # causing it to restore the raw lxc entries, among which there may be > # 'lxc.idmap' entries. We need to make sure that the extracted contents > # of the container match up with the restored configuration afterwards: > - $conf->{lxc} = $orig_conf->{lxc}; > + $conf->{lxc} = $orig_conf->{lxc} if $is_root; > + > + # make sure to retrieve the privilege level of container if not specified > + $conf->{unprivileged} = $orig_conf->{unprivileged} if !defined($unprivileged) > + && defined($orig_conf->{unprivileged}); > } > } > if ($storage_only_mode) { >