From f7a66452377b42e695c9a35edac81e2349bb7110 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Thu, 5 Jul 2012 01:33:22 +0200
Subject: [PATCH] vm: disable D-Bus activation of NetworkManager (#610)

---
 rpm_spec/core-vm.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index 71316f7..de05838 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -559,6 +559,10 @@ done
 
 /bin/systemctl enable qubes-update-check.timer 2> /dev/null
 
+# Disable D-BUS activation of NetworkManager - in AppVm it causes problems (eg PackageKit timeouts)
+/bin/systemctl disable NetworkManager.service 2> /dev/null
+/bin/systemctl mask dbus-org.freedesktop.NetworkManager.service 2> /dev/null
+
 # Install overriden services only when original exists
 for srv in cups NetworkManager ntpd; do
     if [ -f /lib/systemd/system/$srv.service ]; then