Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not error when qvm-get-default-netvm returns empty string.

Browse Source 
It happens when installing qubes-core-dom0 for the first time.
This commit is contained in:
Rafal Wojtczuk 2010-10-06 10:55:32 +02:00
parent 17f6bb8ede
commit 7c1babe8aa
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom0/init.d/qubes_core
View File

@ -46,6 +46,9 @@ stop()
{ {
echo -n $"Shutting down all Qubes VMs:" echo -n $"Shutting down all Qubes VMs:"
NETVM=$(qvm-get-default-netvm) NETVM=$(qvm-get-default-netvm)
if [ "X"$NETVM = "X" ] ; then
NETVM="dom0"
fi
qvm-run -q --shutdown --all --wait --exclude $NETVM 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

4
rpm_spec/core-dom0.spec
View File

@ -175,7 +175,7 @@ done
/etc/init.d/qubes_core start /etc/init.d/qubes_core start
NETVM=$(qvm-get-default-netvm) NETVM=$(qvm-get-default-netvm)
if [ $NETVM = "dom0" ] ; then if [ "X"$NETVM = "X""dom0" ] ; then
/etc/init.d/qubes_netvm start /etc/init.d/qubes_netvm start
fi fi
@ -191,7 +191,7 @@ fi
if [ "$1" -gt 1 ] ; then if [ "$1" -gt 1 ] ; then
# upgrading already installed package... # upgrading already installed package...
NETVM=$(qvm-get-default-netvm) NETVM=$(qvm-get-default-netvm)
if [ $NETVM = "dom0" ] ; then if [ "X"$NETVM = "X""dom0" ] ; then
/etc/init.d/qubes_netvm stop /etc/init.d/qubes_netvm stop
fi fi