[pve-devel] [PATCH manager 0/2] readd TARFILE environment variable in VZDump

[pve-devel] [PATCH manager 0/2] readd TARFILE environment variable in VZDump

[Stoiko Ivanov]

Reported in our community forum:
https://forum.proxmox.com/threads/vzdump-hook-problem-after-last-update.72889/

The patchset changes the example hook-script and additionally reintroduces
the variable TARFILE to not break existing scripts (with a note to drop this
with PVE 7.0).

The second patch is there for a smoother experience of the existing users of
hook-scripts - Maybe we could also just mention it explicitly in the changelog?

feel free to squash the patches if applying both.

Stoiko Ivanov (2):
  vzdump-hook-script: rename TARFILE to TARGET
  VZDump: add TARFILE to environment for hookscripts

 PVE/VZDump.pm         | 2 ++
 vzdump-hook-script.pl | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

-- 
2.20.1

[pve-devel] [PATCH manager 1/2] vzdump-hook-script: rename TARFILE to TARGET

[Stoiko Ivanov]

with the change introduced in 848cf539e59b4553559b9ff3207a3c5556dc1cc0 the
exported variable name changed from tarfile to target.

this patch reflects the renaming in the example hook script.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 vzdump-hook-script.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vzdump-hook-script.pl b/vzdump-hook-script.pl
index 4be46211..1be440b3 100755
--- a/vzdump-hook-script.pl
+++ b/vzdump-hook-script.pl
@@ -43,17 +43,17 @@ if ($phase eq 'job-start' ||
 
     my $hostname = $ENV{HOSTNAME};
 
-    # tarfile is only available in phase 'backup-end'
-    my $tarfile = $ENV{TARFILE};
+    # target is only available in phase 'backup-end'
+    my $target = $ENV{TARGET};
 
     # logfile is only available in phase 'log-end'
     my $logfile = $ENV{LOGFILE};
 
-    print "HOOK-ENV: vmtype=$vmtype;dumpdir=$dumpdir;storeid=$storeid;hostname=$hostname;tarfile=$tarfile;logfile=$logfile\n";
+    print "HOOK-ENV: vmtype=$vmtype;dumpdir=$dumpdir;storeid=$storeid;hostname=$hostname;target=$target;logfile=$logfile\n";
 
     # example: copy resulting backup file to another host using scp
     if ($phase eq 'backup-end') {
-        #system ("scp $tarfile backup-host:/backup-dir") == 0 ||
+        #system ("scp $target backup-host:/backup-dir") == 0 ||
         #    die "copy tar file to backup-host failed";
     }
 
-- 
2.20.1

[pve-devel] [PATCH manager 2/2] VZDump: add TARFILE to environment for hookscripts

[Stoiko Ivanov]

The renaming of tarfile to target in 848cf539e59b4553559b9ff3207a3c5556dc1cc0
can break existing vzdump hook scripts of users.
by setting the TARFILE variable in addition to TARGET the scripts will continue
to work.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 PVE/VZDump.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 601cd56e..6620e997 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -590,6 +590,8 @@ sub run_hook_script {
     foreach my $ek (qw(vmtype hostname target logfile)) {
 	$ENV{uc($ek)} = $task->{$ek} if $task->{$ek};
     }
+    # FIXME: for backwards compatibility - drop with PVE 7.0
+    $ENV{TARFILE} = $task->{target} if $task->{target};
 
     run_command ($logfd, $cmd);
 }
-- 
2.20.1

[pve-devel] applied-series: [PATCH manager 0/2] readd TARFILE environment variable in VZDump

[Thomas Lamprecht]

On 14.07.20 10:09, Stoiko Ivanov wrote:
> Reported in our community forum:
> https://forum.proxmox.com/threads/vzdump-hook-problem-after-last-update.72889/
> 
> The patchset changes the example hook-script and additionally reintroduces
> the variable TARFILE to not break existing scripts (with a note to drop this
> with PVE 7.0).
> 
> The second patch is there for a smoother experience of the existing users of
> hook-scripts - Maybe we could also just mention it explicitly in the changelog?
> 
> feel free to squash the patches if applying both.
> 
> Stoiko Ivanov (2):
>   vzdump-hook-script: rename TARFILE to TARGET
>   VZDump: add TARFILE to environment for hookscripts
> 
>  PVE/VZDump.pm         | 2 ++
>  vzdump-hook-script.pl | 8 ++++----
>  2 files changed, 6 insertions(+), 4 deletions(-)
> 



applied series, thanks!