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.
This commit is contained in:
Marek Marczykowski 2012-01-16 03:26:39 +01:00
parent cfd22f8887
commit cd64f8287c
2 changed files with 2 additions and 7 deletions

View File

@ -61,11 +61,7 @@ start()
stop() stop()
{ {
echo -n $"Shutting down all Qubes VMs:" echo -n $"Shutting down all Qubes VMs:"
NETVM=$(qvm-get-default-netvm) qvm-shutdown -q --all --wait
if [ "X"$NETVM = "X" ] ; then
NETVM="dom0"
fi
qvm-run -q --shutdown --all --wait --exclude $NETVM
rm -f /var/lock/subsys/qubes_core rm -f /var/lock/subsys/qubes_core
killall meminfo-writer killall meminfo-writer
killall qmemman_daemon.py killall qmemman_daemon.py

View File

@ -58,10 +58,9 @@ stop()
echo -n $"Doing nothing:" echo -n $"Doing nothing:"
else else
echo -n $"Stopping NetVMs:" echo -n $"Stopping NetVMs:"
for VM in `get_running_netvms`; do for VM in `get_running_netvms`; do
qvm-run -q --force --shutdown --wait $VM qvm-shutdown -q --force --wait $VM
done done
fi fi