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

Merge remote-tracking branch 'qubesos/pr/47'

Browse Source 
* qubesos/pr/47:
  qvm-device.rst: Document '--ro' option
  qvm-device/block: Alias '--ro' to '--option read-only=yes'
This commit is contained in:
Marek Marczykowski-Górecki 2018-01-11 01:57:57 +01:00
commit 626c764459
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/manpages/qvm-device.rst
View File

@ -59,6 +59,11 @@ Attach the device with *DEVICE_ID* from *BACKEND_DOMAIN* to the domain *VMNAME*
specify this option multiple times. See below for options specific to specify this option multiple times. See below for options specific to
different device classes. different device classes.
.. option:: --ro
Alias for the `read-only=yes` option. If you specify both `--ro` and
`--option read-only=no`, `--ro` takes precedence.
.. option:: --persistent, -p .. option:: --persistent, -p
Attach device persistently, which means have it attached also after qube restart. Attach device persistently, which means have it attached also after qube restart.

5
qubesadmin/tools/qvm_device.py
View File

@ -119,6 +119,8 @@ def attach_device(args):
device_assignment = args.device_assignment device_assignment = args.device_assignment
vm = args.domains[0] vm = args.domains[0]
options = dict(opt.split('=', 1) for opt in args.option or []) options = dict(opt.split('=', 1) for opt in args.option or [])
if args.ro:
options['read-only'] = 'yes'
device_assignment.persistent = args.persistent device_assignment.persistent = args.persistent
device_assignment.options = options device_assignment.options = options
vm.devices[args.devclass].attach(device_assignment) vm.devices[args.devclass].attach(device_assignment)
@ -236,6 +238,9 @@ def get_parser(device_class=None):
attach_parser.add_argument('--option', '-o', action='append', attach_parser.add_argument('--option', '-o', action='append',
help="Set option for the device in opt=value form (can be specified " help="Set option for the device in opt=value form (can be specified "
"multiple times), see man qvm-device for details") "multiple times), see man qvm-device for details")
attach_parser.add_argument('--ro', action='store_true', default=False,
help="Attach device read-only (alias for read-only=yes option, "
"takes precedence)")
attach_parser.add_argument('--persistent', '-p', action='store_true', attach_parser.add_argument('--persistent', '-p', action='store_true',
default=False, default=False,
help="Attach device persistently (so it will be automatically " help="Attach device persistently (so it will be automatically "