From cd64f8287cb29c1a5b9333284c1bf5a29f498bd7 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Mon, 16 Jan 2012 03:26:39 +0100 Subject: [PATCH] dom0/init: Do not exclude NetVM at shutdown (#396) In fact all VMs can be stopped at the same time, no need to keep order. Also use qvm-shutdown to do it. --- dom0/init.d/qubes_core | 6 +----- dom0/init.d/qubes_netvm | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dom0/init.d/qubes_core b/dom0/init.d/qubes_core index c0a60d23..08e61bb0 100755 --- a/dom0/init.d/qubes_core +++ b/dom0/init.d/qubes_core @@ -61,11 +61,7 @@ start() stop() { echo -n $"Shutting down all Qubes VMs:" - NETVM=$(qvm-get-default-netvm) - if [ "X"$NETVM = "X" ] ; then - NETVM="dom0" - fi - qvm-run -q --shutdown --all --wait --exclude $NETVM + qvm-shutdown -q --all --wait rm -f /var/lock/subsys/qubes_core killall meminfo-writer killall qmemman_daemon.py diff --git a/dom0/init.d/qubes_netvm b/dom0/init.d/qubes_netvm index c77a4307..512ee7dc 100755 --- a/dom0/init.d/qubes_netvm +++ b/dom0/init.d/qubes_netvm @@ -58,10 +58,9 @@ stop() echo -n $"Doing nothing:" else - echo -n $"Stopping NetVMs:" for VM in `get_running_netvms`; do - qvm-run -q --force --shutdown --wait $VM + qvm-shutdown -q --force --wait $VM done fi