From 1574c84d66b9f2c173e6b1577d81fe6c0dec473a Mon Sep 17 00:00:00 2001
From: Joanna Rutkowska <joanna@invisiblethingslab.com>
Date: Mon, 30 Jan 2012 11:00:35 +0100
Subject: [PATCH 1/4] dom0: pm-utils: 01qubes-sync-vms-clock: run
 qvm-sync-dom0-clock before syncing clocks on other VMs (#433)

... instead of just $(date), which caused problems when Dom0 clock got
desynced somehow.
---
 dom0/pm-utils/01qubes-sync-vms-clock | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dom0/pm-utils/01qubes-sync-vms-clock b/dom0/pm-utils/01qubes-sync-vms-clock
index 1ba0d8e5..b8a6bf5c 100755
--- a/dom0/pm-utils/01qubes-sync-vms-clock
+++ b/dom0/pm-utils/01qubes-sync-vms-clock
@@ -4,6 +4,7 @@
 
 sync_qubes_vms_wallclock()
 {
+/usr/bin/qvm-sync-dom0-clock
 DATE=$(date)
 echo
 echo "Syncing VMs clock to: $DATE"

From ddecfab7e81df49d0ff1facf2eedd26713da522c Mon Sep 17 00:00:00 2001
From: Joanna Rutkowska <joanna@invisiblethingslab.com>
Date: Mon, 30 Jan 2012 13:09:20 +0100
Subject: [PATCH 2/4] dom0: pm-utils: 01qubes-sync-vms-clock: exclude clockvm
 when syncing clocks on resume

---
 dom0/pm-utils/01qubes-sync-vms-clock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom0/pm-utils/01qubes-sync-vms-clock b/dom0/pm-utils/01qubes-sync-vms-clock
index b8a6bf5c..0980aced 100755
--- a/dom0/pm-utils/01qubes-sync-vms-clock
+++ b/dom0/pm-utils/01qubes-sync-vms-clock
@@ -8,7 +8,7 @@ sync_qubes_vms_wallclock()
 DATE=$(date)
 echo
 echo "Syncing VMs clock to: $DATE"
-qvm-run --all -u root "date -s \"$DATE\""
+qvm-run --all --exclude=`qvm-get-clockvm` -u root "date -s \"$DATE\""
 }
 
 case "$1" in

From 6a51ada8bdbbad608ff32eeaa5e40113f9adee57 Mon Sep 17 00:00:00 2001
From: Joanna Rutkowska <joanna@invisiblethingslab.com>
Date: Mon, 30 Jan 2012 15:42:27 +0100
Subject: [PATCH 3/4] version 1.7.8

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

diff --git a/version_dom0 b/version_dom0
index 91c74a58..84298f96 100644
--- a/version_dom0
+++ b/version_dom0
@@ -1 +1 @@
-1.7.7
+1.7.8
diff --git a/version_vm b/version_vm
index de28578a..84298f96 100644
--- a/version_vm
+++ b/version_vm
@@ -1 +1 @@
-1.7.6
+1.7.8

From 06a0c4a8034ec3f701dafd12117872454b7c8f9a Mon Sep 17 00:00:00 2001
From: Joanna Rutkowska <joanna@invisiblethingslab.com>
Date: Wed, 1 Feb 2012 19:04:39 +0100
Subject: [PATCH 4/4] version 1.7.9-dom0

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

diff --git a/version_dom0 b/version_dom0
index 84298f96..f65dc1e2 100644
--- a/version_dom0
+++ b/version_dom0
@@ -1 +1 @@
-1.7.8
+1.7.9