Sfoglia il codice sorgente

Disable meminfo-writer if there is any PCI device attached

This code used to be in dom0, but it's easier to maintain it in VM.

QubesOS/qubes-issues#2101
Marek Marczykowski-Górecki 8 anni fa
parent
commit
c3d630f288
1 ha cambiato i file con 13 aggiunte e 3 eliminazioni
  1. 13 3
      vm-systemd/qubes-sysinit.sh

+ 13 - 3
vm-systemd/qubes-sysinit.sh

@@ -2,10 +2,20 @@
 
 # List of services enabled by default (in case of absence of qubesdb entry)
 DEFAULT_ENABLED_NETVM="network-manager qubes-network qubes-update-check qubes-updates-proxy"
-DEFAULT_ENABLED_PROXYVM="meminfo-writer qubes-network qubes-firewall qubes-netwatcher qubes-update-check"
-DEFAULT_ENABLED_APPVM="meminfo-writer cups qubes-update-check"
+DEFAULT_ENABLED_PROXYVM="qubes-network qubes-firewall qubes-netwatcher qubes-update-check"
+DEFAULT_ENABLED_APPVM="cups qubes-update-check"
 DEFAULT_ENABLED_TEMPLATEVM="$DEFAULT_ENABLED_APPVM updates-proxy-setup"
-DEFAULT_ENABLED="meminfo-writer"
+DEFAULT_ENABLED=""
+
+if [ -z "`ls /sys/bus/pci/devices/`" ]; then
+    # do not enable meminfo-writer (so qmemman for this domain) when any PCI
+    # device is present
+    DEFAULT_ENABLED="$DEFAULT_ENABLED meminfo-writer"
+    DEFAULT_ENABLED_APPVM="$DEFAULT_ENABLED_APPVM meminfo-writer"
+    DEFAULT_ENABLED_PROXYVM="$DEFAULT_ENABLED_PROXYVM meminfo-writer"
+    DEFAULT_ENABLED_TEMPLATEVM="$DEFAULT_ENABLED_TEMPLATEVM meminfo-writer"
+fi
+
 
 QDB_READ=qubesdb-read
 QDB_LS=qubesdb-multiread