proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-07 08:16:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bump version to 3.1-11

Browse Source 
vzdump: fix hook script environment
This commit is contained in:
Dietmar Maurer 2013-09-13 06:53:03 +02:00
parent b24a745f9a
commit 28272ca2c5
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/VZDump.pm
View File

@ -646,7 +646,11 @@ sub run_hook_script {
local %ENV; local %ENV;
foreach my $ek (qw(vmtype dumpdir hostname tarfile logfile storeid)) { # set immutable opts directly (so they are available in all phases)
$ENV{STOREID} = $opts->{storage} if $opts->{storage};
$ENV{DUMPDIR} = $opts->{dumpdir} if $opts->{dumpdir};
foreach my $ek (qw(vmtype hostname tarfile logfile)) {
$ENV{uc($ek)} = $task->{$ek} if $task->{$ek}; $ENV{uc($ek)} = $task->{$ek} if $task->{$ek};
} }

6
debian/changelog.Debian vendored
View File

@ -1,3 +1,9 @@
pve-manager (3.1-11) unstable; urgency=low
* vzdump: fix hook script environment for job-* phase
-- Proxmox Support Team <support@proxmox.com> Fri, 13 Sep 2013 06:55:30 +0200
pve-manager (3.1-10) unstable; urgency=low pve-manager (3.1-10) unstable; urgency=low
* vzdump: pass storage ID to hook scripts * vzdump: pass storage ID to hook scripts

2
defines.mk
View File

@ -2,7 +2,7 @@ RELEASE=3.1
VERSION=3.1 VERSION=3.1
PACKAGE=pve-manager PACKAGE=pve-manager
PACKAGERELEASE=10 PACKAGERELEASE=11
BINDIR=${DESTDIR}/usr/bin BINDIR=${DESTDIR}/usr/bin
PERLLIBDIR=${DESTDIR}/usr/share/perl5 PERLLIBDIR=${DESTDIR}/usr/share/perl5

8
vzdump-hook-script.pl
View File

@ -12,6 +12,12 @@ if ($phase eq 'job-start' ||
$phase eq 'job-end' || $phase eq 'job-end' ||
$phase eq 'job-abort') { $phase eq 'job-abort') {
my $dumpdir = $ENV{DUMPDIR};
my $storeid = $ENV{STOREID};
print "HOOK-ENV: dumpdir=$dumpdir;storeid=$storeid\n";
# do what you want # do what you want
} elsif ($phase eq 'backup-start' || } elsif ($phase eq 'backup-start' ||
@ -39,7 +45,7 @@ if ($phase eq 'job-start' ||
# logfile is only available in phase 'log-end' # logfile is only available in phase 'log-end'
my $logfile = $ENV{LOGFILE}; my $logfile = $ENV{LOGFILE};
print "HOOK-ENV: vmtype=$vmtype;dumpdir=$dumpdir;hostname=$hostname;tarfile=$tarfile;logfile=$logfile\n"; print "HOOK-ENV: vmtype=$vmtype;dumpdir=$dumpdir;storeid=$storeid;hostname=$hostname;tarfile=$tarfile;logfile=$logfile\n";
# example: copy resulting backup file to another host using scp # example: copy resulting backup file to another host using scp
if ($phase eq 'backup-end') { if ($phase eq 'backup-end') {