X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=src%2FPVE%2FLXC%2FConfig.pm;h=0ef03dcea7677afe9cf1f6c2ad8cb62a8731c2df;hb=552e168f9066c75cc1ce07b2e5e12b543565a15f;hp=9ca364b1beda9bd32964fd7f1fc41f2cb1903b6e;hpb=5e5915c55f55ee0a62edc5da2de281bac4e16960;p=pve-container.git

diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm
index 9ca364b..0ef03dc 100644
--- a/src/PVE/LXC/Config.pm
+++ b/src/PVE/LXC/Config.pm
@@ -44,6 +44,18 @@ sub cfs_config_path {
     return "nodes/$node/lxc/$vmid.conf";
 }
 
+sub mountpoint_backup_enabled {
+    my ($class, $mp_key, $mountpoint) = @_;
+
+    return 1 if $mp_key eq 'rootfs';
+
+    return 0 if $mountpoint->{type} ne 'volume';
+
+    return 1 if $mountpoint->{backup};
+
+    return 0;
+}
+
 sub has_feature {
     my ($class, $feature, $conf, $storecfg, $snapname, $running, $backup_only) = @_;
     my $err;
@@ -52,7 +64,7 @@ sub has_feature {
 	my ($ms, $mountpoint) = @_;
 
 	return if $err; # skip further test
-	return if $backup_only && $ms ne 'rootfs' && !$mountpoint->{backup};
+	return if $backup_only && !$class->mountpoint_backup_enabled($ms, $mountpoint);
 
 	$err = 1
 	    if !PVE::Storage::volume_has_feature($storecfg, $feature,
@@ -97,7 +109,9 @@ sub __snapshot_create_vol_snapshot {
 
     my $storecfg = PVE::Storage::config();
 
-    return if $snapname eq 'vzdump' && $ms ne 'rootfs' && !$mountpoint->{backup};
+    return if $snapname eq 'vzdump' &&
+	!$class->mountpoint_backup_enabled($ms, $mountpoint);
+
     PVE::Storage::volume_snapshot($storecfg, $mountpoint->{volume}, $snapname);
 }
 
@@ -110,7 +124,9 @@ sub __snapshot_delete_remove_drive {
 	my $value = $snap->{$remove_drive};
 	my $mountpoint = $remove_drive eq 'rootfs' ? $class->parse_ct_rootfs($value, 1) : $class->parse_ct_mountpoint($value, 1);
 	delete $snap->{$remove_drive};
-	$class->add_unused_volume($snap, $mountpoint->{volume});
+
+	$class->add_unused_volume($snap, $mountpoint->{volume})
+	    if ($mountpoint->{type} eq 'volume');
     }
 }
 
@@ -123,6 +139,9 @@ sub __snapshot_delete_vmstate_file {
 sub __snapshot_delete_vol_snapshot {
     my ($class, $vmid, $ms, $mountpoint, $snapname, $unused) = @_;
 
+    return if $snapname eq 'vzdump' &&
+	!$class->mountpoint_backup_enabled($ms, $mountpoint);
+
     my $storecfg = PVE::Storage::config();
     PVE::Storage::volume_snapshot_delete($storecfg, $mountpoint->{volume}, $snapname);
     push @$unused, $mountpoint->{volume};
@@ -155,6 +174,35 @@ sub __snapshot_rollback_vm_start {
     die "implement me - save vmstate\n";
 }
 
+sub __snapshot_rollback_get_unused {
+    my ($class, $conf, $snap) = @_;
+
+    my $unused = [];
+
+    $class->__snapshot_foreach_volume($conf, sub {
+	my ($vs, $volume) = @_;
+
+	return if $volume->{type} ne 'volume';
+
+	my $found = 0;
+	my $volid = $volume->{volume};
+
+	$class->__snapshot_foreach_volume($snap, sub {
+	    my ($ms, $mountpoint) = @_;
+
+	    return if $found;
+	    return if ($mountpoint->{type} ne 'volume');
+
+	    $found = 1
+		if ($mountpoint->{volume} && $mountpoint->{volume} eq $volid);
+	});
+
+	push @$unused, $volid if !$found;
+    });
+
+    return $unused;
+}
+
 sub __snapshot_foreach_volume {
     my ($class, $conf, $func) = @_;
 
@@ -175,12 +223,6 @@ my $rootfs_desc = {
 	format_description => 'volume',
 	description => 'Volume, device or directory to mount into the container.',
     },
-    backup => {
-	type => 'boolean',
-	format_description => '[1|0]',
-	description => 'Whether to include the mountpoint in backups.',
-	optional => 1,
-    },
     size => {
 	type => 'string',
 	format => 'disk-size',
@@ -190,22 +232,26 @@ my $rootfs_desc = {
     },
     acl => {
 	type => 'boolean',
-	format_description => 'acl',
 	description => 'Explicitly enable or disable ACL support.',
 	optional => 1,
     },
     ro => {
 	type => 'boolean',
-	format_description => 'ro',
-	description => 'Read-only mountpoint (not supported with bind mounts)',
+	description => 'Read-only mountpoint',
 	optional => 1,
     },
     quota => {
 	type => 'boolean',
-	format_description => '[0|1]',
 	description => 'Enable user quotas inside the container (not supported with zfs subvolumes)',
 	optional => 1,
     },
+    shared => {
+	type => 'boolean',
+	description => 'Mark this non-volume mount point as available on multiple nodes (see \'nodes\')',
+	verbose_description => "Mark this non-volume mount point as available on all nodes.\n\nWARNING: This option does not share the mount point automatically, it assumes it is shared already!",
+	optional => 1,
+	default => 0,
+    },
 };
 
 PVE::JSONSchema::register_standard_option('pve-ct-rootfs', {
@@ -250,7 +296,7 @@ my $confdesc = {
     ostype => {
 	optional => 1,
 	type => 'string',
-	enum => ['debian', 'ubuntu', 'centos', 'fedora', 'opensuse', 'archlinux', 'alpine', 'unmanaged'],
+	enum => [qw(debian ubuntu centos fedora opensuse archlinux alpine gentoo unmanaged)],
 	description => "OS type. This is used to setup configuration inside the container, and corresponds to lxc setup scripts in /usr/share/lxc/config/<ostype>.common.conf. Value 'unmanaged' can be used to skip and OS specific setup.",
     },
     console => {
@@ -267,6 +313,13 @@ my $confdesc = {
 	maximum => 6,
 	default => 2,
     },
+    cores => {
+	optional => 1,
+	type => 'integer',
+	description => "The number of cores assigned to the container. A container can use all available cores by default.",
+	minimum => 1,
+	maximum => 128,
+    },
     cpulimit => {
 	optional => 1,
 	type => 'number',
@@ -306,7 +359,7 @@ my $confdesc = {
     description => {
 	optional => 1,
 	type => 'string',
-	description => "Container description. Only used on the configuration web interface.",
+        description => "Container description. Only used on the configuration web interface.",
     },
     searchdomain => {
 	optional => 1,
@@ -421,27 +474,26 @@ our $netconf_desc = {
     },
     name => {
 	type => 'string',
-	format_description => 'String',
-	description => 'Name of the network device as seen from inside the container. (lxc.network.name)',
+        format_description => 'string',
+ 	description => 'Name of the network device as seen from inside the container. (lxc.network.name)',
 	pattern => '[-_.\w\d]+',
     },
     bridge => {
 	type => 'string',
-	format_description => 'vmbr<Number>',
+	format_description => 'bridge',
 	description => 'Bridge to attach the network device to.',
 	pattern => '[-_.\w\d]+',
 	optional => 1,
     },
     hwaddr => {
 	type => 'string',
-	format_description => 'MAC',
-	description => 'Bridge to attach the network device to. (lxc.network.hwaddr)',
+	format_description => "XX:XX:XX:XX:XX:XX",
+        description => 'The interface MAC address. This is dynamically allocated by default, but you can set that statically if needed, for example to always have the same link-local IPv6 address. (lxc.network.hwaddr)',
 	pattern => qr/(?:[a-f0-9]{2}:){5}[a-f0-9]{2}/i,
 	optional => 1,
     },
     mtu => {
 	type => 'integer',
-	format_description => 'Number',
 	description => 'Maximum transfer unit of the interface. (lxc.network.mtu)',
 	minimum => 64, # minimum ethernet frame is 64 bytes
 	optional => 1,
@@ -476,15 +528,13 @@ our $netconf_desc = {
     },
     firewall => {
 	type => 'boolean',
-	format_description => '[1|0]',
 	description => "Controls whether this interface's firewall rules should be used.",
 	optional => 1,
     },
     tag => {
 	type => 'integer',
-	format_description => 'VlanNo',
-	minimum => '2',
-	maximum => '4094',
+	minimum => 1,
+	maximum => 4094,
 	description => "VLAN tag for this interface.",
 	optional => 1,
     },
@@ -533,11 +583,21 @@ sub verify_lxc_mp_string {
 
 my $mp_desc = {
     %$rootfs_desc,
+    backup => {
+	type => 'boolean',
+	description => 'Whether to include the mountpoint in backups.',
+	verbose_description => 'Whether to include the mountpoint in backups '.
+			       '(only used for volume mountpoints).',
+	optional => 1,
+    },
     mp => {
 	type => 'string',
 	format => 'pve-lxc-mp-string',
 	format_description => 'Path',
-	description => 'Path to the mountpoint as seen from inside the container.',
+	description => 'Path to the mountpoint as seen from inside the container '.
+		       '(must not contain symlinks).',
+	verbose_description => "Path to the mountpoint as seen from inside the container.\n\n".
+			       "NOTE: Must not contain any symlinks for security reasons."
     },
 };
 PVE::JSONSchema::register_format('pve-ct-mountpoint', $mp_desc);
@@ -545,14 +605,14 @@ PVE::JSONSchema::register_format('pve-ct-mountpoint', $mp_desc);
 my $unuseddesc = {
     optional => 1,
     type => 'string', format => 'pve-volume-id',
-    description => "Reference to unused volumes.",
+    description => "Reference to unused volumes. This is used internally, and should not be modified manually.",
 };
 
 for (my $i = 0; $i < $MAX_MOUNT_POINTS; $i++) {
     $confdesc->{"mp$i"} = {
 	optional => 1,
 	type => 'string', format => $mp_desc,
-	description => "Use volume as container mount point (experimental feature).",
+	description => "Use volume as container mount point.",
 	optional => 1,
     };
 }
@@ -720,8 +780,10 @@ sub update_pct_config {
 		next;
 	    }
 
-	    if ($opt eq 'hostname' || $opt eq 'memory' || $opt eq 'rootfs') {
+	    if ($opt eq 'memory' || $opt eq 'rootfs') {
 		die "unable to delete required option '$opt'\n";
+	    } elsif ($opt eq 'hostname') {
+		delete $conf->{$opt};
 	    } elsif ($opt eq 'swap') {
 		delete $conf->{$opt};
 		PVE::LXC::write_cgroup_value("memory", $vmid,
@@ -732,6 +794,8 @@ sub update_pct_config {
 		     $opt eq 'tty' || $opt eq 'console' || $opt eq 'cmode') {
 		next if $hotplug_error->($opt);
 		delete $conf->{$opt};
+	    } elsif ($opt eq 'cores') {
+		delete $conf->{$opt}; # rest is handled by pvestatd
 	    } elsif ($opt eq 'cpulimit') {
 		PVE::LXC::write_cgroup_value("cpu", $vmid, "cpu.cfs_quota_us", -1);
 		delete $conf->{$opt};
@@ -817,7 +881,7 @@ sub update_pct_config {
     foreach my $opt (keys %$param) {
 	my $value = $param->{$opt};
 	my $check_protection_msg = "can't update CT $vmid drive '$opt'";
-	if ($opt eq 'hostname') {
+	if ($opt eq 'hostname' || $opt eq 'arch') {
 	    $conf->{$opt} = $value;
 	} elsif ($opt eq 'onboot') {
 	    $conf->{$opt} = $value ? 1 : 0;
@@ -834,8 +898,14 @@ sub update_pct_config {
 	    next if $hotplug_error->($opt);
 	    my $list = PVE::LXC::verify_searchdomain_list($value);
 	    $conf->{$opt} = $list;
+	} elsif ($opt eq 'cores') {
+	    $conf->{$opt} = $value;# rest is handled by pvestatd
 	} elsif ($opt eq 'cpulimit') {
-	    PVE::LXC::write_cgroup_value("cpu", $vmid, "cpu.cfs_quota_us", int(100000*$value));
+	    if ($value == 0) {
+		PVE::LXC::write_cgroup_value("cpu", $vmid, "cpu.cfs_quota_us", -1);
+	    } else {
+		PVE::LXC::write_cgroup_value("cpu", $vmid, "cpu.cfs_quota_us", int(100000*$value));
+	    }
 	    $conf->{$opt} = $value;
 	} elsif ($opt eq 'cpuunits') {
 	    $conf->{$opt} = $value;
@@ -1033,7 +1103,10 @@ sub parse_lxc_network {
     $res = PVE::JSONSchema::parse_property_string($netconf_desc, $data);
 
     $res->{type} = 'veth';
-    $res->{hwaddr} = PVE::Tools::random_ether_addr() if !$res->{hwaddr};
+    if (!$res->{hwaddr}) {
+	my $dc = PVE::Cluster::cfs_read_file('datacenter.cfg');
+	$res->{hwaddr} = PVE::Tools::random_ether_addr($dc->{mac_prefix});
+    }
 
     return $res;
 }
@@ -1080,6 +1153,19 @@ sub has_dev_console {
     return !(defined($conf->{console}) && !$conf->{console});
 }
 
+sub has_lxc_entry {
+    my ($class, $conf, $keyname) = @_;
+
+    if (my $lxcconf = $conf->{lxc}) {
+	foreach my $entry (@$lxcconf) {
+	    my ($key, undef) = @$entry;
+	    return 1 if $key eq $keyname;
+	}
+    }
+
+    return 0;
+}
+
 sub get_tty_count {
     my ($class, $conf) = @_;
 
@@ -1105,7 +1191,7 @@ sub mountpoint_names {
 }
 
 sub foreach_mountpoint_full {
-    my ($class, $conf, $reverse, $func) = @_;
+    my ($class, $conf, $reverse, $func, @param) = @_;
 
     foreach my $key ($class->mountpoint_names($reverse)) {
 	my $value = $conf->{$key};
@@ -1113,20 +1199,20 @@ sub foreach_mountpoint_full {
 	my $mountpoint = $key eq 'rootfs' ? $class->parse_ct_rootfs($value, 1) : $class->parse_ct_mountpoint($value, 1);
 	next if !defined($mountpoint);
 
-	&$func($key, $mountpoint);
+	&$func($key, $mountpoint, @param);
     }
 }
 
 sub foreach_mountpoint {
-    my ($class, $conf, $func) = @_;
+    my ($class, $conf, $func, @param) = @_;
 
-    $class->foreach_mountpoint_full($conf, 0, $func);
+    $class->foreach_mountpoint_full($conf, 0, $func, @param);
 }
 
 sub foreach_mountpoint_reverse {
-    my ($class, $conf, $func) = @_;
+    my ($class, $conf, $func, @param) = @_;
 
-    $class->foreach_mountpoint_full($conf, 1, $func);
+    $class->foreach_mountpoint_full($conf, 1, $func, @param);
 }
 
 sub get_vm_volumes {