diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index defe9e0..8fdc36a 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -111,7 +111,7 @@ my $verify_notes_template = sub { while ($template =~ /\{\{([^\s{}]+)\}\}/g) { my $var = $1; push @problematic, "variable '$var' at char " . (pos($template) - length($var)) - if $var !~ /^(cluster|guestname|node|vmid)$/; + if $var !~ /^(cluster|guestname|node|pool|vmid)$/; } die "found unknown: " . join(', ', @problematic) . "\n" if scalar(@problematic); @@ -126,6 +126,7 @@ my $generate_notes = sub { cluster => PVE::Cluster::get_clinfo()->{cluster}->{name} // 'standalone node', guestname => $task->{hostname} // "VM $task->{vmid}", # is always set for CTs node => PVE::INotify::nodename(), + pool => cfs_read_file('user.cfg')->{vms}->{ $task->{vmid} } // '', vmid => $task->{vmid}, }; diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 8b99371..2f0ec00 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -2093,7 +2093,7 @@ Ext.define('PVE.Utils', { return value.replace(/(\\\\|\\n)/g, (match) => replace[match]); }, - notesTemplateVars: ['cluster', 'guestname', 'node', 'vmid'], + notesTemplateVars: ['cluster', 'guestname', 'node', 'pool', 'vmid'], renderTags: function (tagstext, overrides) { let text = '';