use File::Path;
use Fcntl;
+use PVE::RPCEnvironment;
use PVE::Storage::PBSPlugin;
use PVE::Storage;
use PVE::DataCenterConfig;
sub sanitize_and_merge_config {
my ($conf, $oldconf, $restricted, $unique) = @_;
+ my $rpcenv = PVE::RPCEnvironment::get();
+
foreach my $key (keys %$oldconf) {
next if $key eq 'digest' || $key eq 'rootfs' || $key eq 'snapshots' || $key eq 'unprivileged' || $key eq 'parent';
next if $key =~ /^mp\d+$/; # don't recover mountpoints
if ($key eq 'lxc' && $restricted) {
my $lxc_list = $oldconf->{'lxc'};
- warn "skipping custom lxc options, restore manually as root:\n";
- warn "--------------------------------\n";
+
+ my $msg = "skipping custom lxc options, restore manually as root:\n";
+ $msg .= "--------------------------------\n";
foreach my $lxc_opt (@$lxc_list) {
- warn "$lxc_opt->[0]: $lxc_opt->[1]\n"
+ $msg .= "$lxc_opt->[0]: $lxc_opt->[1]\n"
}
- warn "--------------------------------\n";
+ $msg .= "--------------------------------";
+
+ $rpcenv->warn($msg);
+
next;
}