From 5d0bd4f6dcb130399bae2e7070dcb20753b90a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 27 Jul 2017 19:03:39 +0200 Subject: [PATCH] tools/qvm-shutdown: drop --force option, it isn't supported anymore Admin API does not allow this action. --- doc/manpages/qvm-shutdown.rst | 7 +------ qubesadmin/tools/qvm_shutdown.py | 5 ----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/doc/manpages/qvm-shutdown.rst b/doc/manpages/qvm-shutdown.rst index 8ac86e0..da62e5d 100644 --- a/doc/manpages/qvm-shutdown.rst +++ b/doc/manpages/qvm-shutdown.rst @@ -15,7 +15,7 @@ Synopsis -------- -:command:`qvm-shutdown` [-h] [--verbose] [--quiet] [--all] [--exclude *EXCLUDE*] [--force] [--wait] [--timeout *TIMEOUT*] [*VMNAME*] +:command:`qvm-shutdown` [-h] [--verbose] [--quiet] [--all] [--exclude *EXCLUDE*] [--wait] [--timeout *TIMEOUT*] [*VMNAME*] Options ------- @@ -40,11 +40,6 @@ Options exclude the qube from :option:`--all` -.. option:: --force - - force operation, even if may damage other VMs (eg. shutdown of network - provider) - .. option:: --wait wait for the VMs to shut down diff --git a/qubesadmin/tools/qvm_shutdown.py b/qubesadmin/tools/qvm_shutdown.py index 5d75574..a0e83ac 100644 --- a/qubesadmin/tools/qvm_shutdown.py +++ b/qubesadmin/tools/qvm_shutdown.py @@ -40,11 +40,6 @@ import qubesadmin.exc parser = qubesadmin.tools.QubesArgumentParser( description=__doc__, vmname_nargs='+') -parser.add_argument('--force', - action='store_true', default=False, - help='force operation, even if may damage other VMs (eg. shutdown of' - ' network provider)') - parser.add_argument('--wait', action='store_true', default=False, help='wait for the VMs to shut down')