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

tools: pause/unpause/shutdown - don't stop on first failed VM

Browse Source 
But still report a failure with exit code if any of them failed.

QubesOS/qubes-issues#853
This commit is contained in:
Marek Marczykowski-Górecki 2017-03-09 02:26:05 +01:00
parent 7baa7e4862
commit 795a06e400
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qubesmgmt/tools/qvm_pause.py
View File

@ -36,10 +36,15 @@ def main(args=None, app=None):
''' '''
args = parser.parse_args(args, app=app) args = parser.parse_args(args, app=app)
exit_code = 0
for domain in args.domains: for domain in args.domains:
domain.pause() try:
domain.pause()
except (IOError, OSError, qubesmgmt.exc.QubesException) as e:
exit_code = 1
parser.print_error(str(e))
return 0 return exit_code
if __name__ == '__main__': if __name__ == '__main__':

5
qubesmgmt/tools/qvm_shutdown.py
View File

@ -28,6 +28,7 @@ import sys
import time import time
import qubesmgmt.tools import qubesmgmt.tools
import qubesmgmt.exc
parser = qubesmgmt.tools.QubesArgumentParser( parser = qubesmgmt.tools.QubesArgumentParser(
description=__doc__, vmname_nargs='+') description=__doc__, vmname_nargs='+')
@ -52,8 +53,10 @@ def main(args=None, app=None): # pylint: disable=missing-docstring
args = parser.parse_args(args, app=app) args = parser.parse_args(args, app=app)
for vm in args.domains: for vm in args.domains:
if not vm.is_halted(): try:
vm.shutdown(force=args.force) vm.shutdown(force=args.force)
except qubesmgmt.exc.QubesVMNotStartedError:
pass
if not args.wait: if not args.wait:
return return

9
qubesmgmt/tools/qvm_unpause.py
View File

@ -37,10 +37,15 @@ def main(args=None, app=None):
''' '''
args = parser.parse_args(args, app=app) args = parser.parse_args(args, app=app)
exit_code = 0
for domain in args.domains: for domain in args.domains:
domain.unpause() try:
domain.unpause()
except (IOError, OSError, qubesmgmt.exc.QubesException) as e:
exit_code = 1
parser.print_error(str(e))
return 0 return exit_code
if __name__ == '__main__': if __name__ == '__main__':