'lxc.utsname' => 1,
'lxc.id_map' => 1,
-
+
'lxc.cgroup.memory.limit_in_bytes' => \&parse_lxc_size,
'lxc.cgroup.memory.memsw.limit_in_bytes' => \&parse_lxc_size,
'lxc.cgroup.cpu.cfs_period_us' => '\d+',
'lxc.cgroup.cpu.cfs_quota_us' => '\d+',
'lxc.cgroup.cpu.shares' => '\d+',
-
+
# mount related
'lxc.mount' => 1,
'lxc.mount.entry' => 1,
'lxc.tty' => '\d+',
'lxc.pts' => 1,
'lxc.haltsignal' => 1,
- 'lxc.rebootsignal' => 1,
+ 'lxc.rebootsignal' => 1,
'lxc.stopsignal' => 1,
'lxc.init_cmd' => 1,
'lxc.console' => 1,
'lxc.hook.start' => 1,
'lxc.hook.post-stop' => 1,
'lxc.hook.clone' => 1,
-
+
# pve related keys
'pve.nameserver' => sub {
my ($name, $value) = @_;
return if $done_hash->{$k};
$done_hash->{$k} = 1;
if (ref($value)) {
- die "got unexpected reference for '$k'"
+ die "got unexpected reference for '$k'"
if !$lxc_array_configs->{$k};
foreach my $v (@$value) {
$raw .= "$k = $v\n";
# Note: Order is important! Include defaults first, so that we
# can overwrite them later.
&$dump_entry('lxc.include');
-
+
foreach my $k (sort keys %$data) {
next if $k !~ m/^lxc\./;
&$dump_entry($k);
die "invalid key '$name'\n" if !defined($parser);
if ($parser eq '1') {
- return $value;
+ return $value;
} elsif (ref($parser)) {
my $res = &$parser($name, $value);
return $res if defined($res);
# assume regex
return $value if $value =~ m/^$parser$/;
}
-
+
die "unable to parse value '$value' for option '$name'\n";
}
die "multiple definitions for $name\n" if defined($data->{$name});
$data->{$name} = parse_lxc_option($name, $value);
}
-
+
next;
}
sub lock_filename {
my ($vmid) = @_;
-
+
return "$lockdir/pve-config-{$vmid}.lock";
}
}
$lock_handles->{$$}->{$filename}->{refcount}++;
-
+
print STDERR " OK\n";
}
};
my $err = $@;
if ($err) {
die "can't lock file '$filename' - $err";
- }
+ }
}
sub lock_release {
# container status helpers
sub list_active_containers {
-
+
my $filename = "/proc/net/unix";
# similar test is used by lcxcontainers.c: list_active_containers
my $res = {};
-
+
my $fh = IO::File->new ($filename, "r");
return $res if !$fh;
}
close($fh);
-
+
return $res;
}
my $active_hash = list_active_containers();
return 1 if defined($active_hash->{$vmid});
-
+
return undef;
}
my ($vmid) = @_;
my $cmd = ['lxc-attach', '-n', $vmid, '--', 'df', '-P', '-B', '1', '/'];
-
+
my $res = {
total => 0,
used => 0,
my $list = $opt_vmid ? { $opt_vmid => { type => 'lxc' }} : config_list();
my $active_hash = list_active_containers();
-
+
foreach my $vmid (keys %$list) {
my $d = $list->{$vmid};
my $running = defined($active_hash->{$vmid});
-
+
$d->{status} = $running ? 'running' : 'stopped';
my $cfspath = cfs_config_path($vmid);
my $conf = PVE::Cluster::cfs_read_file($cfspath) || {};
-
+
$d->{name} = $conf->{'lxc.utsname'} || "CT$vmid";
$d->{name} =~ s/[\s]//g;
-
+
$d->{cpus} = 0;
my $cfs_period_us = $conf->{'lxc.cgroup.cpu.cfs_period_us'};
if ($cfs_period_us && $cfs_quota_us) {
$d->{cpus} = int($cfs_quota_us/$cfs_period_us);
}
-
+
$d->{disk} = 0;
$d->{maxdisk} = defined($conf->{'pve.disksize'}) ?
int($conf->{'pve.disksize'}*1024*1024)*1024 : 1024*1024*1024*1024*1024;
-
+
if (my $private = $conf->{'lxc.rootfs'}) {
if ($private =~ m!^/!) {
my $res = PVE::Tools::df($private, 2);
my $res = get_container_disk_usage($vmid);
$d->{disk} = $res->{used};
$d->{maxdisk} = $res->{total};
- }
+ }
}
}
-
+
$d->{mem} = 0;
$d->{swap} = 0;
$d->{maxmem} = ($conf->{'lxc.cgroup.memory.limit_in_bytes'}||0) +
$d->{diskread} = 0;
$d->{diskwrite} = 0;
}
-
+
foreach my $vmid (keys %$list) {
my $d = $list->{$vmid};
next if $d->{status} ne 'running';
}
}
}
-
+
return $list;
}
sub print_lxc_network {
my $net = shift;
- die "no network bridge defined\n" if !$net->{bridge};
+ die "no network name defined\n" if !$net->{name};
- my $res = "bridge=$net->{bridge}";
+ my $res = "name=$net->{name}";
- foreach my $k (qw(hwaddr mtu name ip gw ip6 gw6 firewall tag)) {
+ foreach my $k (qw(hwaddr mtu bridge ip gw ip6 gw6 firewall tag)) {
next if !defined($net->{$k});
$res .= ",$k=$net->{$k}";
}
$res->{type} = 'veth';
$res->{hwaddr} = PVE::Tools::random_ether_addr() if !$res->{hwaddr};
-
+
return $res;
}
my @args = split(/\0/, $cmdline);
# serach for lxc-console -n <vmid>
- return if scalar(@args) != 3;
+ return if scalar(@args) != 3;
return if $args[1] ne '-n';
return if $args[2] !~ m/^\d+$/;
return if $args[0] !~ m|^(/usr/bin/)?lxc-console$|;
-
+
my $vmid = $args[2];
-
+
push @{$res->{$vmid}}, $pid;
});
return $res;
}
+sub find_lxc_pid {
+ my ($vmid) = @_;
+
+ my $pid = undef;
+ my $parser = sub {
+ my $line = shift;
+ $pid = $1 if $line =~ m/^PID:\s+(\d+)$/;
+ };
+ PVE::Tools::run_command(['lxc-info', '-n', $vmid], outfunc => $parser);
+
+ die "unable to get PID for CT $vmid (not running?)\n" if !$pid;
+
+ return $pid;
+}
+
my $ipv4_reverse_mask = [
'0.0.0.0',
'128.0.0.0',
'255.255.255.254',
'255.255.255.255',
];
-
-# Note: we cannot use Net:IP, because that only allows strict
+
+# Note: we cannot use Net:IP, because that only allows strict
# CIDR networks
sub parse_ipv4_cidr {
my ($cidr, $noerr) = @_;
if ($cidr =~ m!^($IPV4RE)(?:/(\d+))$! && ($2 > 7) && ($2 < 32)) {
return { address => $1, netmask => $ipv4_reverse_mask->[$2] };
}
-
+
return undef if $noerr;
-
+
die "unable to parse ipv4 address/mask\n";
}
} elsif ($k eq 'cpulimit') {
my $cfs_period_us = $lxc_conf->{'lxc.cgroup.cpu.cfs_period_us'};
my $cfs_quota_us = $lxc_conf->{'lxc.cgroup.cpu.cfs_quota_us'};
-
+
if ($cfs_period_us && $cfs_quota_us) {
$conf->{$k} = $cfs_quota_us/$cfs_period_us;
} else {
$conf->{$k} = print_lxc_network($net);
}
}
-
+
return $conf;
}
my @nohotplug;
+ my $rootdir;
+ if ($running) {
+ my $pid = find_lxc_pid($vmid);
+ $rootdir = "/proc/$pid/root";
+ }
+
if (defined($delete)) {
foreach my $opt (@$delete) {
if ($opt eq 'hostname' || $opt eq 'memory') {
write_cgroup_value("cpu", $vmid, "cpu.cfs_quota_us", -1);
}
} elsif ($opt eq 'cpuunits') {
- $conf->{'lxc.cgroup.cpu.shares'} = $value;
+ $conf->{'lxc.cgroup.cpu.shares'} = $value;
write_cgroup_value("cpu", $vmid, "cpu.shares", $value);
} elsif ($opt eq 'description') {
$conf->{'pve.comment'} = PVE::Tools::encode_text($value);
} elsif ($opt =~ m/^net(\d+)$/) {
my $netid = $1;
my $net = PVE::LXC::parse_lxc_network($value);
- my $oldnet = $conf->{$opt} ? $conf->{$opt} : undef;
$net->{'veth.pair'} = "veth${vmid}.$netid";
- $conf->{$opt} = $net;
- next if !$running;
- update_net($vmid, $net, $oldnet, $netid);
+ if (!$running) {
+ $conf->{$opt} = $net;
+ } else {
+ update_net($vmid, $conf, $opt, $net, $netid, $rootdir);
+ }
} else {
die "implement me"
}
my ($conf) = @_;
# return data from net0
-
+
my $net = $conf->{net0};
return undef if !$net;
$ipv4 =~ s!/\d+$!! if $ipv4;
my $ipv6 = $net->{ip};
$ipv6 =~ s!/\d+$!! if $ipv6;
-
+
return ($ipv4, $ipv6);
}
};
sub update_net {
- my ($vmid, $newnet, $oldnet, $netid) = @_;
+ my ($vmid, $conf, $opt, $newnet, $netid, $rootdir) = @_;
my $veth = $newnet->{'veth.pair'};
- my $vethpeer = $veth."p";
+ my $vethpeer = $veth . "p";
my $eth = $newnet->{name};
- if ($oldnet) {
- if (&$safe_string_ne($oldnet->{hwaddr}, $newnet->{hwaddr}) ||
- &$safe_string_ne($oldnet->{name}, $newnet->{name})) {
+ if ($conf->{$opt}) {
+ if (&$safe_string_ne($conf->{$opt}->{hwaddr}, $newnet->{hwaddr}) ||
+ &$safe_string_ne($conf->{$opt}->{name}, $newnet->{name})) {
PVE::Network::veth_delete($veth);
- hotplug_net($vmid, $newnet);
+ delete $conf->{$opt};
+ PVE::LXC::write_config($vmid, $conf);
- } elsif (&$safe_string_ne($oldnet->{bridge}, $newnet->{bridge}) ||
- &$safe_num_ne($oldnet->{tag}, $newnet->{tag}) ||
- &$safe_num_ne($oldnet->{firewall}, $newnet->{firewall})) {
+ hotplug_net($vmid, $conf, $opt, $newnet);
+
+ } elsif (&$safe_string_ne($conf->{$opt}->{bridge}, $newnet->{bridge}) ||
+ &$safe_num_ne($conf->{$opt}->{tag}, $newnet->{tag}) ||
+ &$safe_num_ne($conf->{$opt}->{firewall}, $newnet->{firewall})) {
+
+ if ($conf->{$opt}->{bridge}){
+ PVE::Network::tap_unplug($veth);
+ delete $conf->{$opt}->{bridge};
+ delete $conf->{$opt}->{tag};
+ delete $conf->{$opt}->{firewall};
+ PVE::LXC::write_config($vmid, $conf);
+ }
- PVE::Network::tap_unplug($veth);
PVE::Network::tap_plug($veth, $newnet->{bridge}, $newnet->{tag}, $newnet->{firewall});
+ $conf->{$opt}->{bridge} = $newnet->{bridge} if $newnet->{bridge};
+ $conf->{$opt}->{tag} = $newnet->{tag} if $newnet->{tag};
+ $conf->{$opt}->{firewall} = $newnet->{firewall} if $newnet->{firewall};
+ PVE::LXC::write_config($vmid, $conf);
}
} else {
- hotplug_net($vmid, $newnet);
+ hotplug_net($vmid, $conf, $opt, $newnet);
}
- update_ipconfig($vmid, $eth, $oldnet, $newnet);
+ update_ipconfig($vmid, $conf, $opt, $eth, $newnet, $rootdir);
}
sub hotplug_net {
- my ($vmid, $newnet) = @_;
+ my ($vmid, $conf, $opt, $newnet) = @_;
my $veth = $newnet->{'veth.pair'};
- my $vethpeer = $veth."p";
+ my $vethpeer = $veth . "p";
my $eth = $newnet->{name};
PVE::Network::veth_create($veth, $vethpeer, $newnet->{bridge}, $newnet->{hwaddr});
PVE::Network::tap_plug($veth, $newnet->{bridge}, $newnet->{tag}, $newnet->{firewall});
- #attach peer in container
+ # attach peer in container
my $cmd = ['lxc-device', '-n', $vmid, 'add', $vethpeer, "$eth" ];
PVE::Tools::run_command($cmd);
- #link up peer in container
+ # link up peer in container
$cmd = ['lxc-attach', '-n', $vmid, '-s', 'NETWORK', '--', '/sbin/ip', 'link', 'set', $eth ,'up' ];
PVE::Tools::run_command($cmd);
+
+ $conf->{$opt}->{type} = 'veth';
+ $conf->{$opt}->{bridge} = $newnet->{bridge} if $newnet->{bridge};
+ $conf->{$opt}->{tag} = $newnet->{tag} if $newnet->{tag};
+ $conf->{$opt}->{firewall} = $newnet->{firewall} if $newnet->{firewall};
+ $conf->{$opt}->{hwaddr} = $newnet->{hwaddr} if $newnet->{hwaddr};
+ $conf->{$opt}->{name} = $newnet->{name} if $newnet->{name};
+ $conf->{$opt}->{'veth.pair'} = $newnet->{'veth.pair'} if $newnet->{'veth.pair'};
+
+ delete $conf->{$opt}->{ip} if $conf->{$opt}->{ip};
+ delete $conf->{$opt}->{ip6} if $conf->{$opt}->{ip6};
+ delete $conf->{$opt}->{gw} if $conf->{$opt}->{gw};
+ delete $conf->{$opt}->{gw6} if $conf->{$opt}->{gw6};
+
+ PVE::LXC::write_config($vmid, $conf);
}
sub update_ipconfig {
- my ($vmid, $eth, $oldnet, $newnet) = @_;
+ my ($vmid, $conf, $opt, $eth, $newnet, $rootdir) = @_;
+
+ my $lxc_setup = PVE::LXCSetup->new($conf, $rootdir);
+
+ my $update_gateway;
+ if (&$safe_string_ne($conf->{$opt}->{gw}, $newnet->{gw})) {
+
+ $update_gateway = 1;
+ if ($conf->{$opt}->{gw}) {
+ my $cmd = ['lxc-attach', '-n', $vmid, '-s', 'NETWORK', '--', '/sbin/ip', 'route', 'del', 'default', 'via', $conf->{$opt}->{gw} ];
+ eval { PVE::Tools::run_command($cmd); };
+ warn $@ if $@; # ignore errors here
+ delete $conf->{$opt}->{gw};
+ PVE::LXC::write_config($vmid, $conf);
+ $lxc_setup->setup_network($conf);
+ }
+ }
+
+ if (&$safe_string_ne($conf->{$opt}->{ip}, $newnet->{ip})) {
+
+ if ($conf->{$opt}->{ip}) {
+ my $cmd = ['lxc-attach', '-n', $vmid, '-s', 'NETWORK', '--', '/sbin/ip', 'addr', 'del', $conf->{$opt}->{ip}, 'dev', $eth ];
+ eval { PVE::Tools::run_command($cmd); };
+ warn $@ if $@; # ignore errors here
+ delete $conf->{$opt}->{ip};
+ PVE::LXC::write_config($vmid, $conf);
+ $lxc_setup->setup_network($conf);
+ }
+ if ($newnet->{ip}) {
+ my $cmd = ['lxc-attach', '-n', $vmid, '-s', 'NETWORK', '--', '/sbin/ip', 'addr', 'add', $newnet->{ip}, 'dev', $eth ];
+ PVE::Tools::run_command($cmd);
- if (&$safe_string_ne($oldnet->{ip}, $newnet->{ip})) {
- my $cmd = ['lxc-attach', '-n', $vmid, '-s', 'NETWORK', '--', '/sbin/ip', 'addr', 'add', $newnet->{ip}, 'dev', $eth ];
- PVE::Tools::run_command($cmd);
+ $conf->{$opt}->{ip} = $newnet->{ip};
+ PVE::LXC::write_config($vmid, $conf);
+ $lxc_setup->setup_network($conf);
+ }
}
- if (&$safe_string_ne($oldnet->{gw}, $newnet->{gw})) {
- my $cmd = ['lxc-attach', '-n', $vmid, '-s', 'NETWORK', '--', '/sbin/ip', 'route', 'add', 'default', 'via', $newnet->{gw} ];
- PVE::Tools::run_command($cmd);
+ if ($update_gateway) {
+
+ if ($newnet->{gw}) {
+ my $cmd = ['lxc-attach', '-n', $vmid, '-s', 'NETWORK', '--', '/sbin/ip', 'route', 'add', 'default', 'via', $newnet->{gw} ];
+ PVE::Tools::run_command($cmd);
+
+ $conf->{$opt}->{gw} = $newnet->{gw};
+ PVE::LXC::write_config($vmid, $conf);
+ $lxc_setup->setup_network($conf);
+ }
}
- #fix me : ip,gateway removal
- #fix me : ipv6
- #fix me : write /etc/network/interfaces ?
+ my $update_gateway6;
+ if (&$safe_string_ne($conf->{$opt}->{gw6}, $newnet->{gw6})) {
+
+ $update_gateway6 = 1;
+ if ($conf->{$opt}->{gw6}) {
+ my $cmd = ['lxc-attach', '-n', $vmid, '-s', 'NETWORK', '--', '/sbin/ip', 'route', 'del', 'default', 'via', $conf->{$opt}->{gw6} ];
+ eval { PVE::Tools::run_command($cmd); };
+ warn $@ if $@; # ignore errors here
+ delete $conf->{$opt}->{gw6};
+ PVE::LXC::write_config($vmid, $conf);
+ $lxc_setup->setup_network($conf);
+ }
+
+
+ if (&$safe_string_ne($conf->{$opt}->{ip6}, $newnet->{ip6})) {
+
+ if ($conf->{$opt}->{ip6}) {
+ my $cmd = ['lxc-attach', '-n', $vmid, '-s', 'NETWORK', '--', '/sbin/ip', 'addr', 'del', $conf->{$opt}->{ip6}, 'dev', $eth ];
+ eval { PVE::Tools::run_command($cmd); };
+ warn $@ if $@; # ignore errors here
+ delete $conf->{$opt}->{ip6};
+ PVE::LXC::write_config($vmid, $conf);
+ $lxc_setup->setup_network($conf);
+ }
+
+ if ($newnet->{ip6}) {
+ my $cmd = ['lxc-attach', '-n', $vmid, '-s', 'NETWORK', '--', '/sbin/ip', 'addr', 'add', $newnet->{ip6}, 'dev', $eth ];
+ PVE::Tools::run_command($cmd);
+
+ $conf->{$opt}->{ip6} = $newnet->{ip6};
+ PVE::LXC::write_config($vmid, $conf);
+ $lxc_setup->setup_network($conf);
+ }
+ }
+
+ if ($update_gateway6) {
+
+ if ($newnet->{gw6}) {
+ my $cmd = ['lxc-attach', '-n', $vmid, '-s', 'NETWORK', '--', '/sbin/ip', 'route', 'add', 'default', 'via', $newnet->{gw6} ];
+ PVE::Tools::run_command($cmd);
+
+ $conf->{$opt}->{gw6} = $newnet->{gw6};
+ PVE::LXC::write_config($vmid, $conf);
+ $lxc_setup->setup_network($conf);
+ }
+ }
}
1;
projects / pve-container.git / blobdiff