From b2a3515f4fbd424d360dcf1ab79bbe8c6ae55143 Mon Sep 17 00:00:00 2001
From: Joanna Rutkowska <joanna@invisiblethingslab.com>
Date: Thu, 8 Sep 2011 13:55:33 +0200
Subject: [PATCH 1/4] dom0: qvm-dom0-upgrade: fail when run as non-root user

---
 dom0/qvm-tools/qvm-dom0-upgrade | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dom0/qvm-tools/qvm-dom0-upgrade b/dom0/qvm-tools/qvm-dom0-upgrade
index 90fef29e..1fdb8e58 100755
--- a/dom0/qvm-tools/qvm-dom0-upgrade
+++ b/dom0/qvm-tools/qvm-dom0-upgrade
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+ID=$(id -ur)
+
+if [ $ID != 0 ] ; then
+    echo "This script should be run as root, use sudo. "
+    exit 1
+fi
+
+
 UPDATEVM=`qvm-get-updatevm`
 if [ -z "$UPDATEVM" ]; then
     echo "UpdateVM not set, exiting"

From 89d532ef1109ec2c4662e7129561b35ff030221a Mon Sep 17 00:00:00 2001
From: Joanna Rutkowska <joanna@invisiblethingslab.com>
Date: Thu, 8 Sep 2011 14:09:03 +0200
Subject: [PATCH 2/4] dom0: qubes.py: do not use pci=nomsi as a default
 argument for passthrough VM kernels anymore

---
 dom0/qvm-core/qubes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py
index e46b00b8..d7fe856c 100755
--- a/dom0/qvm-core/qubes.py
+++ b/dom0/qvm-core/qubes.py
@@ -75,7 +75,7 @@ default_firewall_conf_file = "firewall.xml"
 default_memory = 400
 default_servicevm_vcpus = 1
 default_kernelopts = ""
-default_kernelopts_pcidevs = "iommu=soft swiotlb=2048 pci=nomsi"
+default_kernelopts_pcidevs = "iommu=soft swiotlb=2048"
 
 qubes_whitelisted_appmenus = 'whitelisted-appmenus.list'
 

From 583720c67691db569b4babab5397a706b1f6b172 Mon Sep 17 00:00:00 2001
From: Joanna Rutkowska <joanna@invisiblethingslab.com>
Date: Thu, 8 Sep 2011 14:12:56 +0200
Subject: [PATCH 3/4] dom0: qvm-dom0-upgrade: actually check if running as root
 only when used 'manually'

---
 dom0/qvm-tools/qvm-dom0-upgrade | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/dom0/qvm-tools/qvm-dom0-upgrade b/dom0/qvm-tools/qvm-dom0-upgrade
index 1fdb8e58..6cd40254 100755
--- a/dom0/qvm-tools/qvm-dom0-upgrade
+++ b/dom0/qvm-tools/qvm-dom0-upgrade
@@ -1,12 +1,5 @@
 #!/bin/bash
 
-ID=$(id -ur)
-
-if [ $ID != 0 ] ; then
-    echo "This script should be run as root, use sudo. "
-    exit 1
-fi
-
 
 UPDATEVM=`qvm-get-updatevm`
 if [ -z "$UPDATEVM" ]; then
@@ -27,6 +20,14 @@ qvm-run --pass_io $UPDATEVM "/usr/lib/qubes/qubes_download_dom0_updates.sh $*" |
 # Wait for download completed
 while pidof -x qubes-receive-updates >/dev/null; do sleep 0.5; done
 if [ $# -gt 0 ]; then
+
+    ID=$(id -ur)
+    if [ $ID != 0 ] ; then
+        echo "This script should be run as root, use sudo next time."
+        echo "Now you can manually run yum install (use sudo again)."
+        exit
+    fi
+
     yum install $@
 elif [ -f /var/lib/qubes/updates/repodata/repomd.xml ]; then
     yum check-update

From 0e8b6bb3794e3b8bda5fce8d61a3671e92376136 Mon Sep 17 00:00:00 2001
From: Joanna Rutkowska <joanna@invisiblethingslab.com>
Date: Thu, 8 Sep 2011 17:31:57 +0200
Subject: [PATCH 4/4] version 1.6.20

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

diff --git a/version_dom0 b/version_dom0
index 7a9d7939..c45801eb 100644
--- a/version_dom0
+++ b/version_dom0
@@ -1 +1 @@
-1.6.18
+1.6.20
diff --git a/version_vm b/version_vm
index e55f803c..c45801eb 100644
--- a/version_vm
+++ b/version_vm
@@ -1 +1 @@
-1.6.19
+1.6.20