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

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

Browse Source 
* qubesos/pr/25:
  Add missing options to qvm-backup-restore doc.
  Fix --rename-conflicting option.

Fixes QubesOS/qubes-issues#1883
This commit is contained in:
Marek Marczykowski-Górecki 2016-03-29 11:17:51 +02:00
commit 0d1523e28f
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/qvm-tools/qvm-backup-restore.rst
View File

@ -16,6 +16,8 @@ OPTIONS
======= =======
-h, --help -h, --help
Show this help message and exit Show this help message and exit
--verify-only
Do not restore the data, only verify backup integrity
--skip-broken --skip-broken
Do not restore VMs that have missing templates or netvms Do not restore VMs that have missing templates or netvms
--ignore-missing --ignore-missing
@ -32,6 +34,14 @@ OPTIONS
Do not restore dom0 user home dir Do not restore dom0 user home dir
--ignore-username-mismatch --ignore-username-mismatch
Ignore dom0 username mismatch while restoring homedir Ignore dom0 username mismatch while restoring homedir
-d APPVM, --dest-vm=APPVM
The AppVM to send backups to
-e, --encrypted
The backup is encrypted
-z, --compressed
The backup is compressed
--debug
Enable (a lot of) debug output
AUTHORS AUTHORS
======= =======

2
qvm-tools/qvm-backup-restore
View File

@ -115,6 +115,8 @@ def main():
restore_options['use-default-netvm'] = True restore_options['use-default-netvm'] = True
if options.replace_template: if options.replace_template:
restore_options['replace-template'] = options.replace_template restore_options['replace-template'] = options.replace_template
if options.rename_conflicting:
restore_options['rename-conflicting'] = True
if not options.dom0_home: if not options.dom0_home:
restore_options['dom0-home'] = False restore_options['dom0-home'] = False
if options.ignore_username_mismatch: if options.ignore_username_mismatch: