On 5/6/20 10:57 AM, Fabian Grünbichler wrote:
> instead of storage config to determine whether we are in 'PBS mode'
>
> Signed-off-by: Fabian Grünbichler <f.gruenbich...@proxmox.com>
> ---
>
> Notes:
> requires a break on pve-manager << version setting this option,
> since the dependency is the other way round
>
> src/PVE/VZDump/LXC.pm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
> index 2d003d0..45a3d8f 100644
> --- a/src/PVE/VZDump/LXC.pm
> +++ b/src/PVE/VZDump/LXC.pm
> @@ -303,7 +303,7 @@ sub assemble {
> my $firewall ="/etc/pve/firewall/$vmid.fw";
> my $fwconftmp = "$tmpdir/etc/vzdump/pct.fw";
>
> - if ($opts->{scfg}->{type} eq 'pbs') {
> + if ($self->{vzdump}->{opts}->{pbs}) {
> # fixme: do not store pct.conf and fw.conf into $tmpdir
> if (-e $firewall) {
> PVE::Tools::file_copy($firewall, $fwconftmp);
> @@ -356,7 +356,7 @@ sub archive {
>
> my $userns_cmd = $task->{userns_cmd};
>
> - if ($opts->{scfg}->{type} eq 'pbs') {
> + if ($self->{vzdump}->{opts}->{pbs}) {
>
> my $rootdir = $default_mount_point;
> my $param = [];
>
applied series
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
