]> git.proxmox.com Git - pve-container.git/blobdiff - src/PVE/API2/LXC.pm
close #1940: pct console: added ability to specify escape sequence
[pve-container.git] / src / PVE / API2 / LXC.pm
index 076cbf3f8ca41da2a6101583419c89a8d7d42f79..6b3395bea1e2d0bbf149fadd5576869b7b97197b 100644 (file)
@@ -5,7 +5,7 @@ use warnings;
 
 use PVE::SafeSyslog;
 use PVE::Tools qw(extract_param run_command);
-use PVE::Exception qw(raise raise_param_exc);
+use PVE::Exception qw(raise raise_param_exc raise_perm_exc);
 use PVE::INotify;
 use PVE::Cluster qw(cfs_read_file);
 use PVE::AccessControl;
@@ -13,17 +13,25 @@ use PVE::Firewall;
 use PVE::Storage;
 use PVE::RESTHandler;
 use PVE::RPCEnvironment;
+use PVE::ReplicationConfig;
 use PVE::LXC;
 use PVE::LXC::Create;
 use PVE::LXC::Migrate;
+use PVE::GuestHelpers;
 use PVE::API2::LXC::Config;
 use PVE::API2::LXC::Status;
 use PVE::API2::LXC::Snapshot;
-use PVE::HA::Config;
 use PVE::JSONSchema qw(get_standard_option);
 use base qw(PVE::RESTHandler);
 
-use Data::Dumper; # fixme: remove
+BEGIN {
+    if (!$ENV{PVE_GENERATING_DOCS}) {
+       require PVE::HA::Env::PVE2;
+       import  PVE::HA::Env::PVE2;
+       require PVE::HA::Config;
+       import  PVE::HA::Config;
+    }
+}
 
 __PACKAGE__->register_method ({
     subclass => "PVE::API2::LXC::Config",
@@ -45,108 +53,6 @@ __PACKAGE__->register_method ({
     path => '{vmid}/firewall',
 });
 
-my $destroy_disks = sub {
-    my ($storecfg, $vollist) = @_;
-
-    foreach my $volid (@$vollist) {
-       eval { PVE::Storage::vdisk_free($storecfg, $volid); };
-       warn $@ if $@;
-    }
-};
-
-sub mkfs {
-    my ($dev) = @_;
-
-    PVE::Tools::run_command(['mkfs.ext4', '-O', 'mmp', $dev]);
-}
-
-sub format_disk {
-    my ($storage_cfg, $volid) = @_;
-
-    if ($volid =~ m!^/dev/.+!) {
-       return mkfs($volid);
-    }
-
-    my ($storage, $volname) = PVE::Storage::parse_volume_id($volid, 1);
-
-    die "cannot format volume $volid with no storage" if !$storage;
-
-    my $path = PVE::Storage::path($storage_cfg, $volid);
-
-    my ($vtype, undef, undef, undef, undef, $isBase, $format) =
-       PVE::Storage::parse_volname($storage_cfg, $volid);
-
-    if ($format eq 'raw' || $format eq 'subvol') {
-       return mkfs($path);
-    }
-}
-my $create_disks = sub {
-    my ($storecfg, $vmid, $settings, $conf) = @_;
-
-    my $vollist = [];
-
-    eval {
-       PVE::LXC::foreach_mountpoint($settings, sub {
-           my ($ms, $mountpoint) = @_;
-
-           my $volid = $mountpoint->{volume};
-           my $mp = $mountpoint->{mp};
-
-           my ($storage, $volname) = PVE::Storage::parse_volume_id($volid, 1);
-
-           return if !$storage;
-
-           if ($volid =~ m/^([^:\s]+):(\d+(\.\d+)?)$/) {
-               my ($storeid, $size) = ($1, $2);
-
-               $size = int($size*1024) * 1024;
-
-               my $scfg = PVE::Storage::storage_config($storecfg, $storage);
-               # fixme: use better naming ct-$vmid-disk-X.raw?
-
-               if ($scfg->{type} eq 'dir' || $scfg->{type} eq 'nfs') {
-                   if ($size > 0) {
-                       $volid = PVE::Storage::vdisk_alloc($storecfg, $storage, $vmid, 'raw',
-                                                          undef, $size);
-                       format_disk($storecfg, $volid);
-                   } else {
-                       $volid = PVE::Storage::vdisk_alloc($storecfg, $storage, $vmid, 'subvol',
-                                                          undef, 0);
-                   }
-               } elsif ($scfg->{type} eq 'zfspool') {
-
-                   $volid = PVE::Storage::vdisk_alloc($storecfg, $storage, $vmid, 'subvol',
-                                              undef, $size);
-               } elsif ($scfg->{type} eq 'drbd') {
-
-                   $volid = PVE::Storage::vdisk_alloc($storecfg, $storage, $vmid, 'raw', undef, $size);
-                   format_disk($storecfg, $volid);
-
-               } elsif ($scfg->{type} eq 'rbd') {
-
-                   die "krbd option must be enabled on storage type '$scfg->{type}'\n" if !$scfg->{krbd};
-                   $volid = PVE::Storage::vdisk_alloc($storecfg, $storage, $vmid, 'raw', undef, $size);
-                   format_disk($storecfg, $volid);
-               } else {
-                   die "unable to create containers on storage type '$scfg->{type}'\n";
-               }
-               push @$vollist, $volid;
-               $conf->{$ms} = PVE::LXC::print_ct_mountpoint({volume => $volid, size => $size, mp => $mp });
-           } else {
-               # use specified/existing volid
-           }
-       });
-    };
-    # free allocated images on error
-    if (my $err = $@) {
-        syslog('err', "VM $vmid creating disks failed");
-       &$destroy_disks($storecfg, $vollist);
-        die $err;
-    }
-    return $vollist;
-};
-
 __PACKAGE__->register_method({
     name => 'vmlist',
     path => '',
@@ -168,7 +74,7 @@ __PACKAGE__->register_method({
        type => 'array',
        items => {
            type => "object",
-           properties => {},
+           properties => $PVE::LXC::vmstatus_return_properties,
        },
        links => [ { rel => 'child', href => "{vmid}" } ],
     },
@@ -185,7 +91,6 @@ __PACKAGE__->register_method({
            next if !$rpcenv->check($authuser, "/vms/$vmid", [ 'VM.Audit' ], 1);
 
            my $data = $vmstatus->{$vmid};
-           $data->{vmid} = $vmid;
            push @$res, $data;
        }
 
@@ -208,7 +113,7 @@ __PACKAGE__->register_method({
     proxyto => 'node',
     parameters => {
        additionalProperties => 0,
-       properties => PVE::LXC::json_config_properties({
+       properties => PVE::LXC::Config->json_config_properties({
            node => get_standard_option('pve-node'),
            vmid => get_standard_option('pve-vmid', { completion => \&PVE::Cluster::complete_next_vmid }),
            ostemplate => {
@@ -227,6 +132,7 @@ __PACKAGE__->register_method({
                description => "Default Storage.",
                default => 'local',
                optional => 1,
+               completion => \&PVE::Storage::complete_storage_enabled,
            }),
            force => {
                optional => 1,
@@ -243,6 +149,29 @@ __PACKAGE__->register_method({
                type => 'string', format => 'pve-poolid',
                description => "Add the VM to the specified pool.",
            },
+           'ignore-unpack-errors' => {
+               optional => 1,
+               type => 'boolean',
+               description => "Ignore errors when extracting the template.",
+           },
+           'ssh-public-keys' => {
+               optional => 1,
+               type => 'string',
+               description => "Setup public SSH keys (one key per line, " .
+                               "OpenSSH format).",
+           },
+           bwlimit => {
+               description => "Override i/o bandwidth limit (in KiB/s).",
+               optional => 1,
+               type => 'number',
+               minimum => '0',
+           },
+           start => {
+               optional => 1,
+               type => 'boolean',
+               default => 0,
+               description => "Start the CT after its creation finished successfully.",
+           },
        }),
     },
     returns => {
@@ -259,10 +188,19 @@ __PACKAGE__->register_method({
 
        my $vmid = extract_param($param, 'vmid');
 
-       my $basecfg_fn = PVE::LXC::config_file($vmid);
+       my $ignore_unpack_errors = extract_param($param, 'ignore-unpack-errors');
+
+       my $bwlimit = extract_param($param, 'bwlimit');
+
+       my $start_after_create = extract_param($param, 'start');
+
+       my $basecfg_fn = PVE::LXC::Config->config_file($vmid);
 
        my $same_container_exists = -f $basecfg_fn;
 
+       # 'unprivileged' is read-only, so we can't pass it to update_pct_config
+       my $unprivileged = extract_param($param, 'unprivileged');
+
        my $restore = extract_param($param, 'restore');
 
        if ($restore) {
@@ -274,18 +212,15 @@ __PACKAGE__->register_method({
 
        if (!($same_container_exists && $restore && $force)) {
            PVE::Cluster::check_vmid_unused($vmid);
+       } else {
+           my $conf = PVE::LXC::Config->load_config($vmid);
+           PVE::LXC::Config->check_protection($conf, "unable to restore CT $vmid");
        }
 
        my $password = extract_param($param, 'password');
 
-       my $storage = extract_param($param, 'storage') // 'local';
-       
-       my $storage_cfg = cfs_read_file("storage.cfg");
-
-       my $scfg = PVE::Storage::storage_check_node($storage_cfg, $storage, $node);
-
-       raise_param_exc({ storage => "storage '$storage' does not support container root directories"})
-           if !($scfg->{content}->{images} || $scfg->{content}->{rootdir});
+       my $ssh_keys = extract_param($param, 'ssh-public-keys');
+       PVE::Tools::validate_ssh_public_keys($ssh_keys) if defined($ssh_keys);
 
        my $pool = extract_param($param, 'pool');
 
@@ -294,8 +229,6 @@ __PACKAGE__->register_method({
            $rpcenv->check_perm_modify($authuser, "/pool/$pool");
        }
 
-       $rpcenv->check($authuser, "/storage/$storage", ['Datastore.AllocateSpace']);
-       
        if ($rpcenv->check($authuser, "/vms/$vmid", ['VM.Allocate'], 1)) {
            # OK
        } elsif ($pool && $rpcenv->check($authuser, "/pool/$pool", ['VM.Allocate'], 1)) {
@@ -307,11 +240,13 @@ __PACKAGE__->register_method({
            raise_perm_exc();
        }
 
-       PVE::LXC::check_ct_modify_config_perm($rpcenv, $authuser, $vmid, $pool, [ keys %$param]);
+       my $ostemplate = extract_param($param, 'ostemplate');
+       my $storage = extract_param($param, 'storage') // 'local';
 
-       PVE::Storage::activate_storage($storage_cfg, $storage);
+       PVE::LXC::check_ct_modify_config_perm($rpcenv, $authuser, $vmid, $pool, $param, []);
+
+       my $storage_cfg = cfs_read_file("storage.cfg");
 
-       my $ostemplate = extract_param($param, 'ostemplate');
 
        my $archive;
 
@@ -323,23 +258,75 @@ __PACKAGE__->register_method({
            $archive = '-';
            die "restore from pipe requires rootfs parameter\n" if !defined($param->{rootfs});
        } else {
-           $rpcenv->check_volume_access($authuser, $storage_cfg, $vmid, $ostemplate);
+           PVE::Storage::check_volume_access($rpcenv, $authuser, $storage_cfg, $vmid, $ostemplate);
            $archive = PVE::Storage::abs_filesystem_path($storage_cfg, $ostemplate);
        }
 
+       my %used_storages;
+       my $check_and_activate_storage = sub {
+           my ($sid) = @_;
+
+           my $scfg = PVE::Storage::storage_check_node($storage_cfg, $sid, $node);
+
+           raise_param_exc({ storage => "storage '$sid' does not support container directories"})
+               if !$scfg->{content}->{rootdir};
+
+           $rpcenv->check($authuser, "/storage/$sid", ['Datastore.AllocateSpace']);
+
+           PVE::Storage::activate_storage($storage_cfg, $sid);
+
+           $used_storages{$sid} = 1;
+       };
+
        my $conf = {};
 
        my $no_disk_param = {};
+       my $mp_param = {};
+       my $storage_only_mode = 1;
        foreach my $opt (keys %$param) {
            my $value = $param->{$opt};
            if ($opt eq 'rootfs' || $opt =~ m/^mp\d+$/) {
                # allow to use simple numbers (add default storage in that case)
-               $param->{$opt} = "$storage:$value" if $value =~ m/^\d+(\.\d+)?$/;
+               if ($value =~ m/^\d+(\.\d+)?$/) {
+                   $mp_param->{$opt} = "$storage:$value";
+               } else {
+                   $mp_param->{$opt} = $value;
+               }
+               $storage_only_mode = 0;
+           } elsif ($opt =~ m/^unused\d+$/) {
+               warn "ignoring '$opt', cannot create/restore with unused volume\n";
+               delete $param->{$opt};
            } else {
                $no_disk_param->{$opt} = $value;
            }
        }
-       PVE::LXC::update_pct_config($vmid, $conf, 0, $no_disk_param);
+
+       die "mount points configured, but 'rootfs' not set - aborting\n"
+           if !$storage_only_mode && !defined($mp_param->{rootfs});
+
+       # check storage access, activate storage
+       my $delayed_mp_param = {};
+       PVE::LXC::Config->foreach_mountpoint($mp_param, sub {
+           my ($ms, $mountpoint) = @_;
+
+           my $volid = $mountpoint->{volume};
+           my $mp = $mountpoint->{mp};
+
+           if ($mountpoint->{type} ne 'volume') { # bind or device
+               die "Only root can pass arbitrary filesystem paths.\n"
+                   if $authuser ne 'root@pam';
+           } else {
+               my ($sid, $volname) = PVE::Storage::parse_volume_id($volid);
+               &$check_and_activate_storage($sid);
+           }
+       });
+
+       # check/activate default storage
+       &$check_and_activate_storage($storage) if !defined($mp_param->{rootfs});
+
+       PVE::LXC::Config->update_pct_config($vmid, $conf, 0, $no_disk_param);
+
+       $conf->{unprivileged} = 1 if $unprivileged;
 
        my $check_vmid_usage = sub {
            if ($force) {
@@ -352,41 +339,108 @@ __PACKAGE__->register_method({
 
        my $code = sub {
            &$check_vmid_usage(); # final check after locking
-                   
+           my $old_conf;
+
+           my $config_fn = PVE::LXC::Config->config_file($vmid);
+           if (-f $config_fn) {
+               die "container exists" if !$restore; # just to be sure
+               $old_conf = PVE::LXC::Config->load_config($vmid);
+           } else {
+               eval {
+                   # try to create empty config on local node, we have an flock
+                   PVE::LXC::Config->write_config($vmid, {});
+               };
+
+               # another node was faster, abort
+               die "Could not reserve ID $vmid, already taken\n" if $@;
+           }
+
            PVE::Cluster::check_cfs_quorum();
            my $vollist = [];
 
            eval {
-               if (!defined($param->{rootfs})) {
+               if ($storage_only_mode) {
                    if ($restore) {
-                       my (undef, $disksize) = PVE::LXC::Create::recover_config($archive);
-                       $disksize /= 1024 * 1024; # create_disks expects GB as unit size
-                       die "unable to detect disk size - please specify rootfs (size)\n"
-                           if !$disksize;
-                       $param->{rootfs} = "$storage:$disksize";
+                       (undef, $mp_param) = PVE::LXC::Create::recover_config($archive);
+                       die "rootfs configuration could not be recovered, please check and specify manually!\n"
+                           if !defined($mp_param->{rootfs});
+                       PVE::LXC::Config->foreach_mountpoint($mp_param, sub {
+                           my ($ms, $mountpoint) = @_;
+                           my $type = $mountpoint->{type};
+                           if ($type eq 'volume') {
+                               die "unable to detect disk size - please specify $ms (size)\n"
+                                   if !defined($mountpoint->{size});
+                               my $disksize = $mountpoint->{size} / (1024 * 1024 * 1024); # create_disks expects GB as unit size
+                               delete $mountpoint->{size};
+                               $mountpoint->{volume} = "$storage:$disksize";
+                               $mp_param->{$ms} = PVE::LXC::Config->print_ct_mountpoint($mountpoint, $ms eq 'rootfs');
+                           } else {
+                               my $type = $mountpoint->{type};
+                               die "restoring rootfs to $type mount is only possible by specifying -rootfs manually!\n"
+                                   if ($ms eq 'rootfs');
+                               die "restoring '$ms' to $type mount is only possible for root\n"
+                                   if $authuser ne 'root@pam';
+
+                               if ($mountpoint->{backup}) {
+                                   warn "WARNING - unsupported configuration!\n";
+                                   warn "backup was enabled for $type mount point $ms ('$mountpoint->{mp}')\n";
+                                   warn "mount point configuration will be restored after archive extraction!\n";
+                                   warn "contained files will be restored to wrong directory!\n";
+                               }
+                               delete $mp_param->{$ms}; # actually delay bind/dev mps
+                               $delayed_mp_param->{$ms} = PVE::LXC::Config->print_ct_mountpoint($mountpoint, $ms eq 'rootfs');
+                           }
+                       });
                    } else {
-                       $param->{rootfs} = "$storage:4"; # defaults to 4GB
+                       $mp_param->{rootfs} = "$storage:4"; # defaults to 4GB
                    }
                }
 
-               $vollist = &$create_disks($storage_cfg, $vmid, $param, $conf);
+               $vollist = PVE::LXC::create_disks($storage_cfg, $vmid, $mp_param, $conf);
+
+               if (defined($old_conf)) {
+                   # destroy old container volumes
+                   PVE::LXC::destroy_lxc_container($storage_cfg, $vmid, $old_conf, {});
+               }
+
+               eval {
+                   my $rootdir = PVE::LXC::mount_all($vmid, $storage_cfg, $conf, 1);
+                   $bwlimit = PVE::Storage::get_bandwidth_limit('restore', [keys %used_storages], $bwlimit);
+                   PVE::LXC::Create::restore_archive($archive, $rootdir, $conf, $ignore_unpack_errors, $bwlimit);
 
-               PVE::LXC::Create::create_rootfs($storage_cfg, $vmid, $conf, $archive, $password, $restore);
+                   if ($restore) {
+                       PVE::LXC::Create::restore_configuration($vmid, $rootdir, $conf, $authuser ne 'root@pam');
+                   } else {
+                       my $lxc_setup = PVE::LXC::Setup->new($conf, $rootdir); # detect OS
+                       PVE::LXC::Config->write_config($vmid, $conf); # safe config (after OS detection)
+                       $lxc_setup->post_create_hook($password, $ssh_keys);
+                   }
+               };
+               my $err = $@;
+               PVE::LXC::umount_all($vmid, $storage_cfg, $conf, $err ? 1 : 0);
+               PVE::Storage::deactivate_volumes($storage_cfg, PVE::LXC::Config->get_vm_volumes($conf));
+               die $err if $err;
                # set some defaults
                $conf->{hostname} ||= "CT$vmid";
                $conf->{memory} ||= 512;
                $conf->{swap} //= 512;
-               PVE::LXC::create_config($vmid, $conf);
+               foreach my $mp (keys %$delayed_mp_param) {
+                   $conf->{$mp} = $delayed_mp_param->{$mp};
+               }
+               PVE::LXC::Config->write_config($vmid, $conf);
            };
            if (my $err = $@) {
-               &$destroy_disks($storage_cfg, $vollist);
+               PVE::LXC::destroy_disks($storage_cfg, $vollist);
                PVE::LXC::destroy_config($vmid);
                die $err;
            }
            PVE::AccessControl::add_vm_to_pool($vmid, $pool) if $pool;
+
+           PVE::API2::LXC::Status->vm_start({ vmid => $vmid, node => $node })
+               if $start_after_create;
        };
 
-       my $realcmd = sub { PVE::LXC::lock_container($vmid, 1, $code); };
+       my $realcmd = sub { PVE::LXC::Config->lock_config($vmid, $code); };
 
        &$check_vmid_usage(); # first check before locking
 
@@ -425,25 +479,29 @@ __PACKAGE__->register_method({
        my ($param) = @_;
 
        # test if VM exists
-       my $conf = PVE::LXC::load_config($param->{vmid});
+       my $conf = PVE::LXC::Config->load_config($param->{vmid});
 
        my $res = [
            { subdir => 'config' },
            { subdir => 'status' },
            { subdir => 'vncproxy' },
+           { subdir => 'termproxy' },
            { subdir => 'vncwebsocket' },
            { subdir => 'spiceproxy' },
            { subdir => 'migrate' },
+           { subdir => 'clone' },
 #          { subdir => 'initlog' },
            { subdir => 'rrd' },
            { subdir => 'rrddata' },
            { subdir => 'firewall' },
            { subdir => 'snapshot' },
+           { subdir => 'resize' },
            ];
 
        return $res;
     }});
 
+
 __PACKAGE__->register_method({
     name => 'rrd',
     path => '{vmid}/rrd',
@@ -561,24 +619,36 @@ __PACKAGE__->register_method({
        my $vmid = $param->{vmid};
 
        # test if container exists
-       my $conf = PVE::LXC::load_config($vmid);
+       my $conf = PVE::LXC::Config->load_config($vmid);
 
        my $storage_cfg = cfs_read_file("storage.cfg");
 
+       PVE::LXC::Config->check_protection($conf, "can't remove CT $vmid");
+
        die "unable to remove CT $vmid - used in HA resources\n"
            if PVE::HA::Config::vm_is_ha_managed($vmid);
 
+       # do not allow destroy if there are replication jobs
+       my $repl_conf = PVE::ReplicationConfig->new();
+       $repl_conf->check_for_existing_jobs($vmid);
+
+       my $running_error_msg = "unable to destroy CT $vmid - container is running\n";
+
+       die $running_error_msg if PVE::LXC::check_running($vmid); # check early
+
        my $code = sub {
            # reload config after lock
-           $conf = PVE::LXC::load_config($vmid);
-           PVE::LXC::check_lock($conf);
+           $conf = PVE::LXC::Config->load_config($vmid);
+           PVE::LXC::Config->check_lock($conf);
+
+           die $running_error_msg if PVE::LXC::check_running($vmid);
 
            PVE::LXC::destroy_lxc_container($storage_cfg, $vmid, $conf);
            PVE::AccessControl::remove_vm_access($vmid);
            PVE::Firewall::remove_vmfw_conf($vmid);
        };
 
-       my $realcmd = sub { PVE::LXC::lock_container($vmid, 1, $code); };
+       my $realcmd = sub { PVE::LXC::Config->lock_config($vmid, $code); };
        
        return $rpcenv->fork_worker('vzdestroy', $vmid, $authuser, $realcmd);
     }});
@@ -604,6 +674,20 @@ __PACKAGE__->register_method ({
                type => 'boolean',
                description => "use websocket instead of standard VNC.",
            },
+           width => {
+               optional => 1,
+               description => "sets the width of the console in pixels.",
+               type => 'integer',
+               minimum => 16,
+               maximum => 4096,
+           },
+           height => {
+               optional => 1,
+               description => "sets the height of the console in pixels.",
+               type => 'integer',
+               minimum => 16,
+               maximum => 2160,
+           },
        },
     },
     returns => {
@@ -646,10 +730,10 @@ __PACKAGE__->register_method ({
        # NOTE: vncterm VNC traffic is already TLS encrypted,
        # so we select the fastest chipher here (or 'none'?)
        my $remcmd = $remip ?
-           ['/usr/bin/ssh', '-t', $remip] : [];
+           ['/usr/bin/ssh', '-e', 'none', '-t', $remip] : [];
 
-       my $conf = PVE::LXC::load_config($vmid, $node);
-       my $concmd = PVE::LXC::get_console_command($vmid, $conf);
+       my $conf = PVE::LXC::Config->load_config($vmid, $node);
+       my $concmd = PVE::LXC::get_console_command($vmid, $conf, -1);
 
        my $shcmd = [ '/usr/bin/dtach', '-A',
                      "/var/run/dtach/vzctlconsole$vmid",
@@ -666,6 +750,14 @@ __PACKAGE__->register_method ({
                       '-timeout', $timeout, '-authpath', $authpath,
                       '-perm', 'VM.Console'];
 
+           if ($param->{width}) {
+               push @$cmd, '-width', $param->{width};
+           }
+
+           if ($param->{height}) {
+               push @$cmd, '-height', $param->{height};
+           }
+
            if ($param->{websocket}) {
                $ENV{PVE_VNC_TICKET} = $ticket; # pass ticket to vncterm
                push @$cmd, '-notls', '-listen', 'localhost';
@@ -673,7 +765,7 @@ __PACKAGE__->register_method ({
 
            push @$cmd, '-c', @$remcmd, @$shcmd;
 
-           run_command($cmd);
+           run_command($cmd, keeplocale => 1);
 
            return;
        };
@@ -691,6 +783,89 @@ __PACKAGE__->register_method ({
        };
     }});
 
+__PACKAGE__->register_method ({
+    name => 'termproxy',
+    path => '{vmid}/termproxy',
+    method => 'POST',
+    protected => 1,
+    permissions => {
+       check => ['perm', '/vms/{vmid}', [ 'VM.Console' ]],
+    },
+    description => "Creates a TCP proxy connection.",
+    parameters => {
+       additionalProperties => 0,
+       properties => {
+           node => get_standard_option('pve-node'),
+           vmid => get_standard_option('pve-vmid'),
+       },
+    },
+    returns => {
+       additionalProperties => 0,
+       properties => {
+           user => { type => 'string' },
+           ticket => { type => 'string' },
+           port => { type => 'integer' },
+           upid => { type => 'string' },
+       },
+    },
+    code => sub {
+       my ($param) = @_;
+
+       my $rpcenv = PVE::RPCEnvironment::get();
+
+       my $authuser = $rpcenv->get_user();
+
+       my $vmid = $param->{vmid};
+       my $node = $param->{node};
+
+       my $authpath = "/vms/$vmid";
+
+       my $ticket = PVE::AccessControl::assemble_vnc_ticket($authuser, $authpath);
+
+       my ($remip, $family);
+
+       if ($node ne 'localhost' && $node ne PVE::INotify::nodename()) {
+           ($remip, $family) = PVE::Cluster::remote_node_ip($node);
+       } else {
+           $family = PVE::Tools::get_host_address_family($node);
+       }
+
+       my $port = PVE::Tools::next_vnc_port($family);
+
+       my $remcmd = $remip ?
+           ['/usr/bin/ssh', '-e', 'none', '-t', $remip, '--'] : [];
+
+       my $conf = PVE::LXC::Config->load_config($vmid, $node);
+       my $concmd = PVE::LXC::get_console_command($vmid, $conf, -1);
+
+       my $shcmd = [ '/usr/bin/dtach', '-A',
+                     "/var/run/dtach/vzctlconsole$vmid",
+                     '-r', 'winch', '-z', @$concmd];
+
+       my $realcmd = sub {
+           my $upid = shift;
+
+           syslog ('info', "starting lxc termproxy $upid\n");
+
+           my $cmd = ['/usr/bin/termproxy', $port, '--path', $authpath,
+                      '--perm', 'VM.Console', '--'];
+           push @$cmd, @$remcmd, @$shcmd;
+
+           PVE::Tools::run_command($cmd);
+       };
+
+       my $upid = $rpcenv->fork_worker('vncproxy', $vmid, $authuser, $realcmd, 1);
+
+       PVE::Tools::wait_for_vnc_port($port);
+
+       return {
+           user => $authuser,
+           ticket => $ticket,
+           port => $port,
+           upid => $upid,
+       };
+    }});
+
 __PACKAGE__->register_method({
     name => 'vncwebsocket',
     path => '{vmid}/vncwebsocket',
@@ -769,7 +944,7 @@ __PACKAGE__->register_method ({
        my $authpath = "/vms/$vmid";
        my $permissions = 'VM.Console';
 
-       my $conf = PVE::LXC::load_config($vmid);
+       my $conf = PVE::LXC::Config->load_config($vmid);
 
        die "CT $vmid not running\n" if !PVE::LXC::check_running($vmid);
 
@@ -802,13 +977,30 @@ __PACKAGE__->register_method({
            vmid => get_standard_option('pve-vmid', { completion => \&PVE::LXC::complete_ctid }),
            target => get_standard_option('pve-node', {
                description => "Target node.",
-               completion => \&PVE::LXC::complete_migration_target,
+               completion => \&PVE::Cluster::complete_migration_target,
            }),
            online => {
                type => 'boolean',
                description => "Use online/live migration.",
                optional => 1,
            },
+           restart => {
+               type => 'boolean',
+               description => "Use restart migration",
+               optional => 1,
+           },
+           timeout => {
+               type => 'integer',
+               description => "Timeout in seconds for shutdown for restart migration",
+               optional => 1,
+               default => 180,
+           },
+           force => {
+               type => 'boolean',
+               description => "Force migration despite local bind / device" .
+                   " mounts. NOTE: deprecated, use 'shared' property of mount point instead.",
+               optional => 1,
+           },
        },
     },
     returns => {
@@ -836,12 +1028,12 @@ __PACKAGE__->register_method({
        my $vmid = extract_param($param, 'vmid');
 
        # test if VM exists
-       PVE::LXC::load_config($vmid);
+       PVE::LXC::Config->load_config($vmid);
 
        # try to detect errors early
        if (PVE::LXC::check_running($vmid)) {
-           die "can't migrate running container without --online\n"
-               if !$param->{online};
+           die "can't migrate running container without --online or --restart\n"
+               if !$param->{online} && !$param->{restart};
        }
 
        if (PVE::HA::Config::vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') {
@@ -853,7 +1045,7 @@ __PACKAGE__->register_method({
 
                my $cmd = ['ha-manager', 'migrate', $service, $target];
 
-               print "Executing HA migrate for CT $vmid to node $target\n";
+               print "Requesting HA migration for CT $vmid to node $target\n";
 
                PVE::Tools::run_command($cmd);
 
@@ -865,14 +1057,14 @@ __PACKAGE__->register_method({
        } else {
 
            my $realcmd = sub {
-               my $upid = shift;
-
                PVE::LXC::Migrate->migrate($target, $targetip, $vmid, $param);
+           };
 
-               return;
+           my $worker = sub {
+               return PVE::GuestHelpers::guest_migration_lock($vmid, 10, $realcmd);
            };
 
-           return $rpcenv->fork_worker('vzmigrate', $vmid, $authuser, $realcmd);
+           return $rpcenv->fork_worker('vzmigrate', $vmid, $authuser, $worker);
        }
     }});
 
@@ -894,7 +1086,7 @@ __PACKAGE__->register_method({
             feature => {
                 description => "Feature to check.",
                 type => 'string',
-                enum => [ 'snapshot' ],
+                enum => [ 'snapshot', 'clone', 'copy' ],
             },
             snapname => get_standard_option('pve-lxc-snapshot-name', {
                 optional => 1,
@@ -922,7 +1114,7 @@ __PACKAGE__->register_method({
 
        my $feature = extract_param($param, 'feature');
 
-       my $conf = PVE::LXC::load_config($vmid);
+       my $conf = PVE::LXC::Config->load_config($vmid);
 
        if($snapname){
            my $snap = $conf->{snapshots}->{$snapname};
@@ -932,7 +1124,7 @@ __PACKAGE__->register_method({
        my $storage_cfg = PVE::Storage::config();
        #Maybe include later
        #my $nodelist = PVE::LXC::shared_nodes($conf, $storage_cfg);
-       my $hasFeature = PVE::LXC::has_feature($feature, $conf, $storage_cfg, $snapname);
+       my $hasFeature = PVE::LXC::Config->has_feature($feature, $conf, $storage_cfg, $snapname);
 
        return {
            hasFeature => $hasFeature,
@@ -972,34 +1164,650 @@ __PACKAGE__->register_method({
 
        my $updatefn =  sub {
 
-           my $conf = PVE::LXC::load_config($vmid);
-           PVE::LXC::check_lock($conf);
+           my $conf = PVE::LXC::Config->load_config($vmid);
+           PVE::LXC::Config->check_lock($conf);
 
            die "unable to create template, because CT contains snapshots\n"
                if $conf->{snapshots} && scalar(keys %{$conf->{snapshots}});
 
            die "you can't convert a template to a template\n"
-               if PVE::LXC::is_template($conf);
+               if PVE::LXC::Config->is_template($conf);
 
            die "you can't convert a CT to template if the CT is running\n"
                if PVE::LXC::check_running($vmid);
 
+           my $scfg = PVE::Storage::config();
+           PVE::LXC::Config->foreach_mountpoint($conf, sub {
+               my ($ms, $mp) = @_;
+
+               my ($sid) =PVE::Storage::parse_volume_id($mp->{volume}, 0);
+               die "Directory storage '$sid' does not support container templates!\n"
+                   if $scfg->{ids}->{$sid}->{path};
+           });
+
            my $realcmd = sub {
                PVE::LXC::template_create($vmid, $conf);
-           };
 
-           $conf->{template} = 1;
+               $conf->{template} = 1;
 
-           PVE::LXC::write_config($vmid, $conf);
-           # and remove lxc config
-           PVE::LXC::update_lxc_config(undef, $vmid, $conf);
+               PVE::LXC::Config->write_config($vmid, $conf);
+               # and remove lxc config
+               PVE::LXC::update_lxc_config($vmid, $conf);
+           };
 
            return $rpcenv->fork_worker('vztemplate', $vmid, $authuser, $realcmd);
        };
 
-       PVE::LXC::lock_container($vmid, undef, $updatefn);
+       PVE::LXC::Config->lock_config($vmid, $updatefn);
 
        return undef;
     }});
 
+__PACKAGE__->register_method({
+    name => 'clone_vm',
+    path => '{vmid}/clone',
+    method => 'POST',
+    protected => 1,
+    proxyto => 'node',
+    description => "Create a container clone/copy",
+    permissions => {
+       description => "You need 'VM.Clone' permissions on /vms/{vmid}, " .
+           "and 'VM.Allocate' permissions " .
+           "on /vms/{newid} (or on the VM pool /pool/{pool}). You also need " .
+           "'Datastore.AllocateSpace' on any used storage.",
+       check =>
+       [ 'and',
+         ['perm', '/vms/{vmid}', [ 'VM.Clone' ]],
+         [ 'or',
+           [ 'perm', '/vms/{newid}', ['VM.Allocate']],
+           [ 'perm', '/pool/{pool}', ['VM.Allocate'], require_param => 'pool'],
+         ],
+       ]
+    },
+    parameters => {
+       additionalProperties => 0,
+       properties => {
+           node => get_standard_option('pve-node'),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::LXC::complete_ctid }),
+           newid => get_standard_option('pve-vmid', {
+               completion => \&PVE::Cluster::complete_next_vmid,
+               description => 'VMID for the clone.' }),
+           hostname => {
+               optional => 1,
+               type => 'string', format => 'dns-name',
+               description => "Set a hostname for the new CT.",
+           },
+           description => {
+               optional => 1,
+               type => 'string',
+               description => "Description for the new CT.",
+           },
+           pool => {
+               optional => 1,
+               type => 'string', format => 'pve-poolid',
+               description => "Add the new CT to the specified pool.",
+           },
+           snapname => get_standard_option('pve-lxc-snapshot-name', {
+               optional => 1,
+            }),
+           storage => get_standard_option('pve-storage-id', {
+               description => "Target storage for full clone.",
+               optional => 1,
+           }),
+           full => {
+               optional => 1,
+               type => 'boolean',
+               description => "Create a full copy of all disks. This is always done when " .
+                   "you clone a normal CT. For CT templates, we try to create a linked clone by default.",
+           },
+           target => get_standard_option('pve-node', {
+               description => "Target node. Only allowed if the original VM is on shared storage.",
+               optional => 1,
+           }),
+        },
+    },
+    returns => {
+       type => 'string',
+    },
+    code => sub {
+       my ($param) = @_;
+
+       my $rpcenv = PVE::RPCEnvironment::get();
+
+        my $authuser = $rpcenv->get_user();
+
+       my $node = extract_param($param, 'node');
+
+       my $vmid = extract_param($param, 'vmid');
+
+       my $newid = extract_param($param, 'newid');
+
+       my $pool = extract_param($param, 'pool');
+
+       if (defined($pool)) {
+           $rpcenv->check_pool_exist($pool);
+       }
+
+       my $snapname = extract_param($param, 'snapname');
+
+       my $storage = extract_param($param, 'storage');
+
+       my $target = extract_param($param, 'target');
+
+        my $localnode = PVE::INotify::nodename();
+
+        undef $target if $target && ($target eq $localnode || $target eq 'localhost');
+
+       PVE::Cluster::check_node_exists($target) if $target;
+
+       my $storecfg = PVE::Storage::config();
+
+       if ($storage) {
+           # check if storage is enabled on local node
+           PVE::Storage::storage_check_enabled($storecfg, $storage);
+           if ($target) {
+               # check if storage is available on target node
+               PVE::Storage::storage_check_node($storecfg, $storage, $target);
+               # clone only works if target storage is shared
+               my $scfg = PVE::Storage::storage_config($storecfg, $storage);
+               die "can't clone to non-shared storage '$storage'\n" if !$scfg->{shared};
+           }
+       }
+
+       PVE::Cluster::check_cfs_quorum();
+
+       my $conffile;
+       my $newconf = {};
+       my $mountpoints = {};
+       my $fullclone = {};
+       my $vollist = [];
+       my $running;
+
+       PVE::LXC::Config->lock_config($vmid, sub {
+           my $src_conf = PVE::LXC::Config->set_lock($vmid, 'disk');
+
+           $running = PVE::LXC::check_running($vmid) || 0;
+
+           my $full = extract_param($param, 'full');
+           if (!defined($full)) {
+               $full = !PVE::LXC::Config->is_template($src_conf);
+           }
+           die "parameter 'storage' not allowed for linked clones\n" if defined($storage) && !$full;
+
+           eval {
+               die "snapshot '$snapname' does not exist\n"
+                   if $snapname && !defined($src_conf->{snapshots}->{$snapname});
+
+
+               my $src_conf = $snapname ? $src_conf->{snapshots}->{$snapname} : $src_conf;
+
+               $conffile = PVE::LXC::Config->config_file($newid);
+               die "unable to create CT $newid: config file already exists\n"
+                   if -f $conffile;
+
+               my $sharedvm = 1;
+               foreach my $opt (keys %$src_conf) {
+                   next if $opt =~ m/^unused\d+$/;
+
+                   my $value = $src_conf->{$opt};
+
+                   if (($opt eq 'rootfs') || ($opt =~ m/^mp\d+$/)) {
+                       my $mp = $opt eq 'rootfs' ?
+                           PVE::LXC::Config->parse_ct_rootfs($value) :
+                           PVE::LXC::Config->parse_ct_mountpoint($value);
+
+                       if ($mp->{type} eq 'volume') {
+                           my $volid = $mp->{volume};
+
+                           my ($sid, $volname) = PVE::Storage::parse_volume_id($volid);
+                           $sid = $storage if defined($storage);
+                           my $scfg = PVE::Storage::storage_config($storecfg, $sid);
+                           if (!$scfg->{shared}) {
+                               $sharedvm = 0;
+                               warn "found non-shared volume: $volid\n" if $target;
+                           }
+
+                           $rpcenv->check($authuser, "/storage/$sid", ['Datastore.AllocateSpace']);
+
+                           if ($full) {
+                               die "Cannot do full clones on a running container without snapshots\n"
+                                   if $running && !defined($snapname);
+                               $fullclone->{$opt} = 1;
+                           } else {
+                               # not full means clone instead of copy
+                               die "Linked clone feature for '$volid' is not available\n"
+                                   if !PVE::Storage::volume_has_feature($storecfg, 'clone', $volid, $snapname, $running);
+                           }
+
+                           $mountpoints->{$opt} = $mp;
+                           push @$vollist, $volid;
+
+                       } else {
+                           # TODO: allow bind mounts?
+                           die "unable to clone mountpint '$opt' (type $mp->{type})\n";
+                       }
+                   } elsif ($opt =~ m/^net(\d+)$/) {
+                       # always change MAC! address
+                       my $dc = PVE::Cluster::cfs_read_file('datacenter.cfg');
+                       my $net = PVE::LXC::Config->parse_lxc_network($value);
+                       $net->{hwaddr} = PVE::Tools::random_ether_addr($dc->{mac_prefix});
+                       $newconf->{$opt} = PVE::LXC::Config->print_lxc_network($net);
+                   } else {
+                       # copy everything else
+                       $newconf->{$opt} = $value;
+                   }
+               }
+               die "can't clone CT to node '$target' (CT uses local storage)\n"
+                   if $target && !$sharedvm;
+
+               # Replace the 'disk' lock with a 'create' lock.
+               $newconf->{lock} = 'create';
+
+               delete $newconf->{template};
+               if ($param->{hostname}) {
+                   $newconf->{hostname} = $param->{hostname};
+               }
+
+               if ($param->{description}) {
+                   $newconf->{description} = $param->{description};
+               }
+
+               # create empty/temp config - this fails if CT already exists on other node
+               PVE::LXC::Config->write_config($newid, $newconf);
+           };
+           if (my $err = $@) {
+               eval { PVE::LXC::Config->remove_lock($vmid, 'disk') };
+               warn $@ if $@;
+               die $err;
+           }
+       });
+
+       my $update_conf = sub {
+           my ($key, $value) = @_;
+           return PVE::LXC::Config->lock_config($newid, sub {
+               my $conf = PVE::LXC::Config->load_config($newid);
+               die "Lost 'create' config lock, aborting.\n"
+                   if !PVE::LXC::Config->has_lock($conf, 'create');
+               $conf->{$key} = $value;
+               PVE::LXC::Config->write_config($newid, $conf);
+           });
+       };
+
+       my $realcmd = sub {
+           my ($upid) = @_;
+
+           my $newvollist = [];
+
+           my $verify_running = PVE::LXC::check_running($vmid) || 0;
+           die "unexpected state change\n" if $verify_running != $running;
+
+           eval {
+               local $SIG{INT} =
+                   local $SIG{TERM} =
+                   local $SIG{QUIT} =
+                   local $SIG{HUP} = sub { die "interrupted by signal\n"; };
+
+               PVE::Storage::activate_volumes($storecfg, $vollist, $snapname);
+
+               foreach my $opt (keys %$mountpoints) {
+                   my $mp = $mountpoints->{$opt};
+                   my $volid = $mp->{volume};
+
+                   my $newvolid;
+                   if ($fullclone->{$opt}) {
+                       print "create full clone of mountpoint $opt ($volid)\n";
+                       my $target_storage = $storage // PVE::Storage::parse_volume_id($volid);
+                       $newvolid = PVE::LXC::copy_volume($mp, $newid, $target_storage, $storecfg, $newconf, $snapname);
+                   } else {
+                       print "create linked clone of mount point $opt ($volid)\n";
+                       $newvolid = PVE::Storage::vdisk_clone($storecfg, $volid, $newid, $snapname);
+                   }
+
+                   push @$newvollist, $newvolid;
+                   $mp->{volume} = $newvolid;
+
+                   $update_conf->($opt, PVE::LXC::Config->print_ct_mountpoint($mp, $opt eq 'rootfs'));
+               }
+
+               PVE::AccessControl::add_vm_to_pool($newid, $pool) if $pool;
+               PVE::LXC::Config->remove_lock($newid, 'create');
+
+               if ($target) {
+                   # always deactivate volumes - avoid lvm LVs to be active on several nodes
+                   PVE::Storage::deactivate_volumes($storecfg, $vollist, $snapname) if !$running;
+                   PVE::Storage::deactivate_volumes($storecfg, $newvollist);
+
+                   my $newconffile = PVE::LXC::Config->config_file($newid, $target);
+                   die "Failed to move config to node '$target' - rename failed: $!\n"
+                       if !rename($conffile, $newconffile);
+               }
+           };
+           my $err = $@;
+
+           # Unlock the source config in any case:
+           eval { PVE::LXC::Config->remove_lock($vmid, 'disk') };
+           warn $@ if $@;
+
+           if ($err) {
+               # Now cleanup the config & disks:
+               unlink $conffile;
+
+               sleep 1; # some storages like rbd need to wait before release volume - really?
+
+               foreach my $volid (@$newvollist) {
+                   eval { PVE::Storage::vdisk_free($storecfg, $volid); };
+                   warn $@ if $@;
+               }
+               die "clone failed: $err";
+           }
+
+           return;
+       };
+
+       PVE::Firewall::clone_vmfw_conf($vmid, $newid);
+       return $rpcenv->fork_worker('vzclone', $vmid, $authuser, $realcmd);
+    }});
+
+
+__PACKAGE__->register_method({
+    name => 'resize_vm',
+    path => '{vmid}/resize',
+    method => 'PUT',
+    protected => 1,
+    proxyto => 'node',
+    description => "Resize a container mount point.",
+    permissions => {
+       check => ['perm', '/vms/{vmid}', ['VM.Config.Disk'], any => 1],
+    },
+    parameters => {
+       additionalProperties => 0,
+       properties => {
+           node => get_standard_option('pve-node'),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::LXC::complete_ctid }),
+           disk => {
+               type => 'string',
+               description => "The disk you want to resize.",
+               enum => [PVE::LXC::Config->mountpoint_names()],
+           },
+           size => {
+               type => 'string',
+               pattern => '\+?\d+(\.\d+)?[KMGT]?',
+               description => "The new size. With the '+' sign the value is added to the actual size of the volume and without it, the value is taken as an absolute one. Shrinking disk size is not supported.",
+           },
+           digest => {
+               type => 'string',
+               description => 'Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.',
+               maxLength => 40,
+               optional => 1,
+           }
+       },
+    },
+    returns => {
+       type => 'string',
+       description => "the task ID.",
+    },
+    code => sub {
+       my ($param) = @_;
+
+       my $rpcenv = PVE::RPCEnvironment::get();
+
+       my $authuser = $rpcenv->get_user();
+
+       my $node = extract_param($param, 'node');
+
+       my $vmid = extract_param($param, 'vmid');
+
+       my $digest = extract_param($param, 'digest');
+
+       my $sizestr = extract_param($param, 'size');
+       my $ext = ($sizestr =~ s/^\+//);
+       my $newsize = PVE::JSONSchema::parse_size($sizestr);
+       die "invalid size string" if !defined($newsize);
+
+       die "no options specified\n" if !scalar(keys %$param);
+
+       PVE::LXC::check_ct_modify_config_perm($rpcenv, $authuser, $vmid, undef, $param, []);
+
+       my $storage_cfg = cfs_read_file("storage.cfg");
+
+       my $code = sub {
+
+           my $conf = PVE::LXC::Config->load_config($vmid);
+           PVE::LXC::Config->check_lock($conf);
+
+           PVE::Tools::assert_if_modified($digest, $conf->{digest});
+
+           my $running = PVE::LXC::check_running($vmid);
+
+           my $disk = $param->{disk};
+           my $mp = $disk eq 'rootfs' ? PVE::LXC::Config->parse_ct_rootfs($conf->{$disk}) :
+               PVE::LXC::Config->parse_ct_mountpoint($conf->{$disk});
+
+           my $volid = $mp->{volume};
+
+           my (undef, undef, $owner, undef, undef, undef, $format) =
+               PVE::Storage::parse_volname($storage_cfg, $volid);
+
+           die "can't resize mount point owned by another container ($owner)"
+               if $vmid != $owner;
+
+           die "can't resize volume: $disk if snapshot exists\n"
+               if %{$conf->{snapshots}} && $format eq 'qcow2';
+
+           my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid);
+
+           $rpcenv->check($authuser, "/storage/$storeid", ['Datastore.AllocateSpace']);
+
+           PVE::Storage::activate_volumes($storage_cfg, [$volid]);
+
+           my $size = PVE::Storage::volume_size_info($storage_cfg, $volid, 5);
+           $newsize += $size if $ext;
+           $newsize = int($newsize);
+
+           die "unable to shrink disk size\n" if $newsize < $size;
+
+           return if $size == $newsize;
+
+           PVE::Cluster::log_msg('info', $authuser, "update CT $vmid: resize --disk $disk --size $sizestr");
+           my $realcmd = sub {
+               # Note: PVE::Storage::volume_resize doesn't do anything if $running=1, so
+               # we pass 0 here (parameter only makes sense for qemu)
+               PVE::Storage::volume_resize($storage_cfg, $volid, $newsize, 0);
+
+               $mp->{size} = $newsize;
+               $conf->{$disk} = PVE::LXC::Config->print_ct_mountpoint($mp, $disk eq 'rootfs');
+
+               PVE::LXC::Config->write_config($vmid, $conf);
+
+               if ($format eq 'raw') {
+                   my $path = PVE::Storage::path($storage_cfg, $volid, undef);
+                   if ($running) {
+
+                       $mp->{mp} = '/';
+                       my $use_loopdev = (PVE::LXC::mountpoint_mount_path($mp, $storage_cfg))[1];
+                       $path = PVE::LXC::query_loopdev($path) if $use_loopdev;
+                       die "internal error: CT running but mount point not attached to a loop device"
+                           if !$path;
+                       PVE::Tools::run_command(['losetup', '--set-capacity', $path]) if $use_loopdev;
+
+                       # In order for resize2fs to know that we need online-resizing a mountpoint needs
+                       # to be visible to it in its namespace.
+                       # To not interfere with the rest of the system we unshare the current mount namespace,
+                       # mount over /tmp and then run resize2fs.
+
+                       # interestingly we don't need to e2fsck on mounted systems...
+                       my $quoted = PVE::Tools::shellquote($path);
+                       my $cmd = "mount --make-rprivate / && mount $quoted /tmp && resize2fs $quoted";
+                       eval {
+                           PVE::Tools::run_command(['unshare', '-m', '--', 'sh', '-c', $cmd]);
+                       };
+                       warn "Failed to update the container's filesystem: $@\n" if $@;
+                   } else {
+                       eval {
+                           PVE::Tools::run_command(['e2fsck', '-f', '-y', $path]);
+                           PVE::Tools::run_command(['resize2fs', $path]);
+                       };
+                       warn "Failed to update the container's filesystem: $@\n" if $@;
+                   }
+               }
+           };
+
+           return $rpcenv->fork_worker('resize', $vmid, $authuser, $realcmd);
+       };
+
+       return PVE::LXC::Config->lock_config($vmid, $code);;
+    }});
+
+__PACKAGE__->register_method({
+    name => 'move_volume',
+    path => '{vmid}/move_volume',
+    method => 'POST',
+    protected => 1,
+    proxyto => 'node',
+    description => "Move a rootfs-/mp-volume to a different storage",
+    permissions => {
+       description => "You need 'VM.Config.Disk' permissions on /vms/{vmid}, " .
+           "and 'Datastore.AllocateSpace' permissions on the storage.",
+       check =>
+       [ 'and',
+         ['perm', '/vms/{vmid}', [ 'VM.Config.Disk' ]],
+         ['perm', '/storage/{storage}', [ 'Datastore.AllocateSpace' ]],
+       ],
+    },
+    parameters => {
+       additionalProperties => 0,
+       properties => {
+           node => get_standard_option('pve-node'),
+           vmid => get_standard_option('pve-vmid', { completion => \&PVE::LXC::complete_ctid }),
+           volume => {
+               type => 'string',
+               enum => [ PVE::LXC::Config->mountpoint_names() ],
+               description => "Volume which will be moved.",
+           },
+           storage => get_standard_option('pve-storage-id', {
+               description => "Target Storage.",
+               completion => \&PVE::Storage::complete_storage_enabled,
+           }),
+           delete => {
+               type => 'boolean',
+               description => "Delete the original volume after successful copy. By default the original is kept as an unused volume entry.",
+               optional => 1,
+               default => 0,
+           },
+           digest => {
+               type => 'string',
+               description => 'Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.',
+               maxLength => 40,
+               optional => 1,
+           }
+       },
+    },
+    returns => {
+       type => 'string',
+    },
+    code => sub {
+       my ($param) = @_;
+
+       my $rpcenv = PVE::RPCEnvironment::get();
+
+       my $authuser = $rpcenv->get_user();
+
+       my $vmid = extract_param($param, 'vmid');
+
+       my $storage = extract_param($param, 'storage');
+
+       my $mpkey = extract_param($param, 'volume');
+
+       my $lockname = 'disk';
+
+       my ($mpdata, $old_volid);
+
+       PVE::LXC::Config->lock_config($vmid, sub {
+           my $conf = PVE::LXC::Config->load_config($vmid);
+           PVE::LXC::Config->check_lock($conf);
+
+           die "cannot move volumes of a running container\n" if PVE::LXC::check_running($vmid);
+
+           if ($mpkey eq 'rootfs') {
+               $mpdata = PVE::LXC::Config->parse_ct_rootfs($conf->{$mpkey});
+           } elsif ($mpkey =~ m/mp\d+/) {
+               $mpdata = PVE::LXC::Config->parse_ct_mountpoint($conf->{$mpkey});
+           } else {
+               die "Can't parse $mpkey\n";
+           }
+           $old_volid = $mpdata->{volume};
+
+           die "you can't move a volume with snapshots and delete the source\n"
+               if $param->{delete} && PVE::LXC::Config->is_volume_in_use_by_snapshots($conf, $old_volid);
+
+           PVE::Tools::assert_if_modified($param->{digest}, $conf->{digest});
+
+           PVE::LXC::Config->set_lock($vmid, $lockname);
+       });
+
+       my $realcmd = sub {
+           eval {
+               PVE::Cluster::log_msg('info', $authuser, "move volume CT $vmid: move --volume $mpkey --storage $storage");
+
+               my $conf = PVE::LXC::Config->load_config($vmid);
+               my $storage_cfg = PVE::Storage::config();
+
+               my $new_volid;
+
+               eval {
+                   PVE::Storage::activate_volumes($storage_cfg, [ $old_volid ]);
+                   $new_volid = PVE::LXC::copy_volume($mpdata, $vmid, $storage, $storage_cfg, $conf);
+                   $mpdata->{volume} = $new_volid;
+
+                   PVE::LXC::Config->lock_config($vmid, sub {
+                       my $digest = $conf->{digest};
+                       $conf = PVE::LXC::Config->load_config($vmid);
+                       PVE::Tools::assert_if_modified($digest, $conf->{digest});
+
+                       $conf->{$mpkey} = PVE::LXC::Config->print_ct_mountpoint($mpdata, $mpkey eq 'rootfs');
+
+                       PVE::LXC::Config->add_unused_volume($conf, $old_volid) if !$param->{delete};
+
+                       PVE::LXC::Config->write_config($vmid, $conf);
+                   });
+
+                   eval {
+                       # try to deactivate volumes - avoid lvm LVs to be active on several nodes
+                       PVE::Storage::deactivate_volumes($storage_cfg, [ $new_volid ])
+                   };
+                   warn $@ if $@;
+               };
+               if (my $err = $@) {
+                   eval {
+                       PVE::Storage::vdisk_free($storage_cfg, $new_volid)
+                           if defined($new_volid);
+                   };
+                   warn $@ if $@;
+                   die $err;
+               }
+
+               if ($param->{delete}) {
+                   eval {
+                       PVE::Storage::deactivate_volumes($storage_cfg, [ $old_volid ]);
+                       PVE::Storage::vdisk_free($storage_cfg, $old_volid);
+                   };
+                   warn $@ if $@;
+               }
+           };
+           my $err = $@;
+           eval { PVE::LXC::Config->remove_lock($vmid, $lockname) };
+           warn $@ if $@;
+           die $err if $err;
+       };
+       my $task = eval {
+           $rpcenv->fork_worker('move_volume', $vmid, $authuser, $realcmd);
+       };
+       if (my $err = $@) {
+           eval { PVE::LXC::Config->remove_lock($vmid, $lockname) };
+           warn $@ if $@;
+           die $err;
+       }
+       return $task;
+  }});
+
 1;