Skip to content

Commit

Permalink
Kill remaining qubesdb-daemon instances after shutting down all the VMs
Browse files Browse the repository at this point in the history
It may happen (especially when VM doesn't close cleanly and needs to be
killed) that qubesdb-daemon will not notice VM shutdown immediately.
Normally it would stop after 60s timeout, but speed it up in case of
system shutdown

QubesOS/qubes-issues#1425
  • Loading branch information
marmarek committed Nov 15, 2015
1 parent 7359e39 commit bae493d
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions linux/systemd/qubes-core.service
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ StandardOutput=syslog
RemainAfterExit=yes
ExecStart=/usr/lib/qubes/startup-misc.sh
ExecStop=/usr/bin/qvm-shutdown -q --all --wait
# QubesDB daemons stop after 60s timeout in worst case; speed it up, since no
# VMs are running now
ExecStop=-/usr/bin/killall qubesdb-daemon

[Install]
WantedBy=multi-user.target
Expand Down

0 comments on commit bae493d

Please sign in to comment.