X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=src%2FPVE%2FLXC.pm;h=bce032ae0adbc494afab82073f927ee57d124f10;hb=108c6cab98b091f82b725c98f198bada9752ccdc;hp=8d91b228a8ae5b3014dccf15316ee8a88b7a14a6;hpb=5fa038abea8b993199f6e573069b6f6a59c15920;p=pve-container.git

diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 8d91b22..bce032a 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -26,8 +26,6 @@ use PVE::Syscall;
 use PVE::LXC::Config;
 use Time::HiRes qw (gettimeofday);
 
-use Data::Dumper;
-
 my $nodename = PVE::INotify::nodename();
 
 my $cpuinfo= PVE::ProcFSTools::read_cpuinfo();
@@ -351,20 +349,17 @@ sub update_lxc_config {
     $raw .= "lxc.arch = $conf->{arch}\n";
 
     my $unprivileged = $conf->{unprivileged};
-    my $custom_idmap = grep { $_->[0] eq 'lxc.id_map' } @{$conf->{lxc}};
+    my $custom_idmap = grep { $_->[0] eq 'lxc.idmap' } @{$conf->{lxc}};
 
     my $ostype = $conf->{ostype} || die "missing 'ostype' - internal error";
-    if ($ostype =~ /^(?:debian | ubuntu | centos | fedora | opensuse | archlinux | alpine | gentoo | unmanaged)$/x) {
-	my $inc ="/usr/share/lxc/config/$ostype.common.conf";
-	$inc ="/usr/share/lxc/config/common.conf" if !-f $inc;
-	$raw .= "lxc.include = $inc\n";
-	if ($unprivileged || $custom_idmap) {
-	    $inc = "/usr/share/lxc/config/$ostype.userns.conf";
-	    $inc = "/usr/share/lxc/config/userns.conf" if !-f $inc;
-	    $raw .= "lxc.include = $inc\n"
-	}
-    } else {
-	die "implement me (ostype $ostype)";
+
+    my $inc ="/usr/share/lxc/config/$ostype.common.conf";
+    $inc ="/usr/share/lxc/config/common.conf" if !-f $inc;
+    $raw .= "lxc.include = $inc\n";
+    if ($unprivileged || $custom_idmap) {
+	$inc = "/usr/share/lxc/config/$ostype.userns.conf";
+	$inc = "/usr/share/lxc/config/userns.conf" if !-f $inc;
+	$raw .= "lxc.include = $inc\n"
     }
 
     # WARNING: DO NOT REMOVE this without making sure that loop device nodes
@@ -376,23 +371,23 @@ sub update_lxc_config {
 
     # Should we read them from /etc/subuid?
     if ($unprivileged && !$custom_idmap) {
-	$raw .= "lxc.id_map = u 0 100000 65536\n";
-	$raw .= "lxc.id_map = g 0 100000 65536\n";
+	$raw .= "lxc.idmap = u 0 100000 65536\n";
+	$raw .= "lxc.idmap = g 0 100000 65536\n";
     }
 
     if (!PVE::LXC::Config->has_dev_console($conf)) {
-	$raw .= "lxc.console = none\n";
+	$raw .= "lxc.console.path = none\n";
 	$raw .= "lxc.cgroup.devices.deny = c 5:1 rwm\n";
     }
 
     my $ttycount = PVE::LXC::Config->get_tty_count($conf);
-    $raw .= "lxc.tty = $ttycount\n";
+    $raw .= "lxc.tty.max = $ttycount\n";
 
     # some init scripts expect a linux terminal (turnkey).
     $raw .= "lxc.environment = TERM=linux\n";
     
     my $utsname = $conf->{hostname} || "CT$vmid";
-    $raw .= "lxc.utsname = $utsname\n";
+    $raw .= "lxc.uts.name = $utsname\n";
 
     my $memory = $conf->{memory} || 512;
     my $swap = $conf->{swap} // 0;
@@ -417,33 +412,28 @@ sub update_lxc_config {
 
     my $mountpoint = PVE::LXC::Config->parse_ct_rootfs($conf->{rootfs});
 
-    $raw .= "lxc.rootfs = $dir/rootfs\n";
+    $raw .= "lxc.rootfs.path = $dir/rootfs\n";
 
-    my $netcount = 0;
     foreach my $k (sort keys %$conf) {
 	next if $k !~ m/^net(\d+)$/;
 	my $ind = $1;
 	my $d = PVE::LXC::Config->parse_lxc_network($conf->{$k});
-	$netcount++;
-	$raw .= "lxc.network.type = veth\n";
-	$raw .= "lxc.network.veth.pair = veth${vmid}i${ind}\n";
-	$raw .= "lxc.network.hwaddr = $d->{hwaddr}\n" if defined($d->{hwaddr});
-	$raw .= "lxc.network.name = $d->{name}\n" if defined($d->{name});
-	$raw .= "lxc.network.mtu = $d->{mtu}\n" if defined($d->{mtu});
+	$raw .= "lxc.net.$ind.type = veth\n";
+	$raw .= "lxc.net.$ind.veth.pair = veth${vmid}i${ind}\n";
+	$raw .= "lxc.net.$ind.hwaddr = $d->{hwaddr}\n" if defined($d->{hwaddr});
+	$raw .= "lxc.net.$ind.name = $d->{name}\n" if defined($d->{name});
+	$raw .= "lxc.net.$ind.mtu = $d->{mtu}\n" if defined($d->{mtu});
     }
 
     my $had_cpuset = 0;
     if (my $lxcconf = $conf->{lxc}) {
 	foreach my $entry (@$lxcconf) {
 	    my ($k, $v) = @$entry;
-	    $netcount++ if $k eq 'lxc.network.type';
 	    $had_cpuset = 1 if $k eq 'lxc.cgroup.cpuset.cpus';
 	    $raw .= "$k = $v\n";
 	}
     }
 
-    $raw .= "lxc.network.type = empty\n" if !$netcount;
-
     my $cores = $conf->{cores};
     if (!$had_cpuset && $cores) {
 	my $cpuset = eval { PVE::CpuSet->new_from_cgroup('lxc', 'effective_cpus') };
@@ -1331,6 +1321,7 @@ sub destroy_disks {
     }
 }
 
+our $NEW_DISK_RE = qr/^([^:\s]+):(\d+(\.\d+)?)$/;
 sub create_disks {
     my ($storecfg, $vmid, $settings, $conf) = @_;
 
@@ -1348,7 +1339,7 @@ sub create_disks {
 
 	    my ($storage, $volname) = PVE::Storage::parse_volume_id($volid, 1);
 
-	    if ($storage && ($volid =~ m/^([^:\s]+):(\d+(\.\d+)?)$/)) {
+	    if ($storage && ($volid =~ $NEW_DISK_RE)) {
 		my ($storeid, $size_gb) = ($1, $2);
 
 		my $size_kb = int(${size_gb}*1024) * 1024;
@@ -1479,7 +1470,8 @@ sub parse_id_maps {
     my $lxc = $conf->{lxc};
     foreach my $entry (@$lxc) {
 	my ($key, $value) = @$entry;
-	next if $key ne 'lxc.id_map';
+	# FIXME: remove the 'id_map' variant when lxc-3.0 arrives
+	next if $key ne 'lxc.idmap' && $key ne 'lxc.id_map';
 	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];
@@ -1488,7 +1480,7 @@ sub parse_id_maps {
 		$rootgid = $host if $type eq 'g';
 	    }
 	} else {
-	    die "failed to parse id_map: $value\n";
+	    die "failed to parse idmap: $value\n";
 	}
     }