From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Mon, 5 Jun 2023 09:51:48 +0000 (+0200)
Subject: drop old 'lxc.id_map' config key support
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=cd65ea28765d98409d6c98c55f0777e4fbb4e102;p=pve-container.git

drop old 'lxc.id_map' config key support

lxc since v3 only support 'lxc.idmap' now and we don't need
to support this here either anymore

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---

diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index fe1a5cf..e582a94 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -2300,8 +2300,9 @@ sub parse_id_maps {
     my $lxc = $conf->{lxc};
     foreach my $entry (@$lxc) {
 	my ($key, $value) = @$entry;
-	# FIXME: remove the 'id_map' variant when lxc-3.0 arrives
-	next if $key ne 'lxc.idmap' && $key ne 'lxc.id_map';
+
+	next if $key ne 'lxc.idmap';
+
 	if ($value =~ /^([ug])\s+(\d+)\s+(\d+)\s+(\d+)\s*$/) {
 	    my ($type, $ct, $host, $length) = ($1, $2, $3, $4);
 	    push @$id_map, [$type, $ct, $host, $length];