Merge remote-tracking branch 'origin/pr/166'

* origin/pr/166: qvm-backup: dom0 dst relative to cwd of tool, not qubesd
QubesOS · Feb 24, 2021 · 0d2877b · 0d2877b
2 parents 2c1e792 + e78512b
commit 0d2877b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/qubesadmin/tools/qvm_backup.py b/qubesadmin/tools/qvm_backup.py
@@ -103,11 +103,13 @@ def write_backup_profile(output_stream, args, passphrase=None):
     if passphrase:
         profile_data['passphrase_text'] = passphrase
     profile_data['compression'] = args.compression
-    if args.appvm:
+    if args.appvm and args.appvm != 'dom0':
         profile_data['destination_vm'] = args.appvm
+        profile_data['destination_path'] = args.backup_location
     else:
         profile_data['destination_vm'] = 'dom0'
-    profile_data['destination_path'] = args.backup_location
+        profile_data['destination_path'] = os.path.join(
+            os.getcwd(), args.backup_location)
 
     yaml.safe_dump(profile_data, output_stream)