From 3df2e9783dc392b165b79f85938429e1b8ff2d3d Mon Sep 17 00:00:00 2001
From: Rafal Wojtczuk <rafal@invisiblethingslab.com>
Date: Tue, 26 Jul 2011 16:36:59 +0200
Subject: [PATCH] dispvm: when updating savefile on demand, present zenity
 progress bar

---
 dom0/restore/qfile-daemon-dvm                      |  3 +--
 .../qubes_update_dispvm_savefile_with_progress.sh  | 14 ++++++++++++++
 rpm_spec/core-dom0.spec                            |  2 ++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100755 dom0/restore/qubes_update_dispvm_savefile_with_progress.sh

diff --git a/dom0/restore/qfile-daemon-dvm b/dom0/restore/qfile-daemon-dvm
index 04a811f3..c03a6cba 100755
--- a/dom0/restore/qfile-daemon-dvm
+++ b/dom0/restore/qfile-daemon-dvm
@@ -109,8 +109,7 @@ class QfileDaemonDvm:
 
     def get_dvm(self):
         if not self.dvm_setup_ok():
-            self.tray_notify("Updating DisposableVM savefile, please wait", 120000)
-            if os.system("qvm-create-default-dvm --default-template --default-script >/var/run/qubes/qvm-create-default-dvm.stdout </dev/null" ) != 0:
+            if os.system("/usr/lib/qubes/qubes_update_dispvm_savefile_with_progress.sh >/dev/null </dev/null" ) != 0:
                 self.tray_notify_error("DVM savefile creation failed")
                 return None 
         return self.do_get_dvm()
diff --git a/dom0/restore/qubes_update_dispvm_savefile_with_progress.sh b/dom0/restore/qubes_update_dispvm_savefile_with_progress.sh
new file mode 100755
index 00000000..74155ec5
--- /dev/null
+++ b/dom0/restore/qubes_update_dispvm_savefile_with_progress.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+trap "exit 1" USR1 TERM
+export SHELL_PID=$$
+(
+	echo "1"
+	if ! qvm-create-default-dvm --default-template --default-script >/var/run/qubes/qvm-create-default-dvm.stdout </dev/null ; then 
+		kill -USR1 $SHELL_PID
+	fi
+        echo 100 
+) | zenity --progress --pulsate --auto-close \
+	--text="Please wait (up to 120s) while the DispVM savefile is being updated. This only happens when you have updated the template, next time will be much faster." \
+	--title="Updating default DispVM savefile"
+exit 0
+                  
\ No newline at end of file
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index b29e7540..2feec85f 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -117,6 +117,7 @@ cp restore/qvm-create-default-dvm $RPM_BUILD_ROOT/usr/bin
 cp restore/xenstore-watch $RPM_BUILD_ROOT/usr/bin/xenstore-watch-qubes
 cp restore/qubes_restore restore/xenfreepages $RPM_BUILD_ROOT/usr/lib/qubes
 cp restore/qubes_prepare_saved_domain.sh  $RPM_BUILD_ROOT/usr/lib/qubes
+cp restore/qubes_update_dispvm_savefile_with_progress.sh  $RPM_BUILD_ROOT/usr/lib/qubes
 cp restore/qfile-daemon-dvm $RPM_BUILD_ROOT/usr/lib/qubes
 
 mkdir -p $RPM_BUILD_ROOT/etc/yum.real.repos.d
@@ -333,6 +334,7 @@ fi
 /usr/bin/xenstore-watch-qubes
 /usr/lib/qubes/qubes_restore
 /usr/lib/qubes/qubes_prepare_saved_domain.sh
+/usr/lib/qubes/qubes_update_dispvm_savefile_with_progress.sh
 /etc/xen/scripts/block.qubes
 /etc/xen/scripts/block-snapshot
 /etc/xen/scripts/block-origin