From 08632445612108418c12255dbe9924fcaad3a6b9 Mon Sep 17 00:00:00 2001
From: Joanna Rutkowska <joanna@invisiblethingslab.com>
Date: Mon, 12 Sep 2011 14:28:44 +0200
Subject: [PATCH 1/3] dom0: qvm-backup-restore: also restore appmenus for
 template VMs

---
 dom0/qvm-tools/qvm-backup-restore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dom0/qvm-tools/qvm-backup-restore b/dom0/qvm-tools/qvm-backup-restore
index da8101c7..46fce9e0 100755
--- a/dom0/qvm-tools/qvm-backup-restore
+++ b/dom0/qvm-tools/qvm-backup-restore
@@ -321,6 +321,12 @@ def main():
                 host_collection.pop(vm.qid)
             continue
 
+        try:
+            vm.create_appmenus(verbose=True)
+        except Exception as err:
+            print "ERROR during appmenu restore: {0}".format(err)
+            print "*** VM '{0}' will not have appmenus".format(vm.name)
+
     # ... then appvms...
     for vm in [ vm for vm in vms_to_restore if vm.is_appvm()]:
 

From c697426838cac35934cc8cdcac4211553350c6a9 Mon Sep 17 00:00:00 2001
From: Joanna Rutkowska <joanna@invisiblethingslab.com>
Date: Mon, 12 Sep 2011 14:29:20 +0200
Subject: [PATCH 2/3] version 1.6.24-dom0

---
 version_dom0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version_dom0 b/version_dom0
index d2fda6f3..4ad1e55e 100644
--- a/version_dom0
+++ b/version_dom0
@@ -1 +1 @@
-1.6.23
+1.6.24

From 322a5e81bd58871a8d7b293d52a4c65e7a35ed9f Mon Sep 17 00:00:00 2001
From: Joanna Rutkowska <joanna@invisiblethingslab.com>
Date: Tue, 13 Sep 2011 19:23:48 +0200
Subject: [PATCH 3/3] version 1.6.25

---
 version_dom0 | 2 +-
 version_vm   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/version_dom0 b/version_dom0
index 4ad1e55e..a92834b0 100644
--- a/version_dom0
+++ b/version_dom0
@@ -1 +1 @@
-1.6.24
+1.6.25
diff --git a/version_vm b/version_vm
index c45801eb..a92834b0 100644
--- a/version_vm
+++ b/version_vm
@@ -1 +1 @@
-1.6.20
+1.6.25