Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core

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'
 

dom0/qvm-tools/qvm-dom0-upgrade

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+
 UPDATEVM=`qvm-get-updatevm`
 if [ -z "$UPDATEVM" ]; then
     echo "UpdateVM not set, exiting"
@@ -19,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

version_dom0

@@ -1 +1 @@
-1.6.18
+1.6.20

version_vm

@@ -1 +1 @@
-1.6.19
+1.6.20