fix #949: add post-restart hook to vzdump

diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 59d0b5faecf305385631df15f18eb68cab5d6aff..3101b6a25e6896fada26d86556b8ce2b743d49ea 100644 (file)
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -903,6 +903,7 @@ sub exec_backup_task {
                $cleanup->{resume} = 0;
                $self->run_hook_script('pre-restart', $task, $logfd);
                $plugin->resume_vm($task, $vmid);
+               $self->run_hook_script('post-restart', $task, $logfd);
                my $delay = time () - $vmstoptime;
                debugmsg('info', "vm is online again after $delay seconds", $logfd);
            }
@@ -934,6 +935,8 @@ sub exec_backup_task {
                debugmsg ('info', "vm is online again after $delay seconds", $logfd);
            }
 
+           $self->run_hook_script ('post-restart', $task, $logfd);
+
        } else {
            die "internal error - unknown mode '$mode'\n";
        }
@@ -1010,7 +1013,8 @@ sub exec_backup_task {
                        debugmsg ('info', "restarting vm", $logfd);
                        $plugin->start_vm ($task, $vmid);
                    }
-               } 
+               }
+               $self->run_hook_script ('post-restart', $task, $logfd);
            };
            my $err = $@;
            if ($err) {

diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index 6ed0f724419f54bf21093e22b4b56c5525e4e186..4d26794c38ca2b19f6da9c99fc5ef82a78a6bc5d 100644 (file)
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -8,6 +8,8 @@ pve-manager (4.1-34) unstable; urgency=medium
 
   * add enableKeyEvents to combogrid
 
+  * fix #949: add post-restart hook to vzdump
+
  -- Proxmox Support Team <support@proxmox.com>  Fri, 22 Apr 2016 09:15:07 +0200
 
 pve-manager (4.1-33) unstable; urgency=medium

diff --git a/vzdump-hook-script.pl b/vzdump-hook-script.pl
index b03fdc2dff4c1404d060e7d405cb80ade345b06c..a93eeec80bd09128e70a4a9775438ab658da2191 100755 (executable)
--- a/vzdump-hook-script.pl
+++ b/vzdump-hook-script.pl
@@ -25,7 +25,8 @@ if ($phase eq 'job-start' ||
         $phase eq 'backup-abort' || 
         $phase eq 'log-end' || 
         $phase eq 'pre-stop' ||
-        $phase eq 'pre-restart') {
+        $phase eq 'pre-restart' ||
+        $phase eq 'post-restart') {
 
     my $mode = shift; # stop/suspend/snapshot