From 28e1f962e5bf717581dab159dc8180ef1a30ade7 Mon Sep 17 00:00:00 2001
From: Joanna Rutkowska <joanna@invisiblethingslab.com>
Date: Mon, 4 Oct 2010 17:51:01 +0200
Subject: [PATCH] core dom0 rpm: restart qubes_netvm only when using netvm in
 Dom0

If we use a separate netvm, then core update in Dom0 doesn't really change the networking,
worse, if we restarted netvm it would get another XID, which would break our DispVM savefile.

One day we should fix it!
---
 rpm_spec/core-dom0.spec | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index 26251978..7d54df4b 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -173,7 +173,11 @@ for i in /usr/share/qubes/icons/*.png ; do
 done
 
 /etc/init.d/qubes_core start
-/etc/init.d/qubes_netvm start
+
+NETVM=$(qvm-get-default-netvm)
+if [ $NETVM = "dom0" ] ; then
+    /etc/init.d/qubes_netvm start
+fi
 
 
 %clean
@@ -186,7 +190,11 @@ fi
 
 if [ "$1" -gt 1 ] ; then
     # upgrading already installed package...
-    /etc/init.d/qubes_netvm stop
+    NETVM=$(qvm-get-default-netvm)
+    if [ $NETVM = "dom0" ] ; then
+        /etc/init.d/qubes_netvm stop
+    fi
+
     /etc/init.d/qubes_core stop
 fi