diff --git a/vm-systemd/qubes-sysinit.sh b/vm-systemd/qubes-sysinit.sh index a46ac18..503dfa9 100755 --- a/vm-systemd/qubes-sysinit.sh +++ b/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