Skip to content

Commit 6043890

Browse files
committed
Merge remote-tracking branch 'origin/pr/307'
* origin/pr/307: Document killing of paused qubes on shutdown
2 parents 0f96960 + 85c1ff9 commit 6043890

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

doc/manpages/qvm-pause.rst

+5
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ Options
3131

3232
Exclude the qube from :option:`--all`.
3333

34+
Notes
35+
-----
36+
37+
Paused qubes will be killed on system shutdown.
38+
3439
Authors
3540
-------
3641

qubesadmin/tools/qvm_pause.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525

2626

2727
parser = qubesadmin.tools.QubesArgumentParser(vmname_nargs='+',
28-
description='pause a domain')
28+
description='pause a qube',
29+
epilog='Paused qubes will be killed on system shutdown.')
2930

3031

3132
def main(args=None, app=None):

0 commit comments

Comments
 (0)