fix backup qmp parameters to pass along encryption info
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
		
							parent
							
								
									2e4f5f2a90
								
							
						
					
					
						commit
						6d46b2ff4c
					
				
							
								
								
									
										43
									
								
								debian/patches/pve/0046-pbs-fix-missing-crypt-and-compress-parameters.patch
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										43
									
								
								debian/patches/pve/0046-pbs-fix-missing-crypt-and-compress-parameters.patch
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @ -0,0 +1,43 @@ | ||||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||||
| From: Wolfgang Bumiller <w.bumiller@proxmox.com> | ||||
| Date: Fri, 10 Jul 2020 13:22:35 +0200 | ||||
| Subject: [PATCH] pbs: fix missing crypt and compress parameters | ||||
| 
 | ||||
| Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> | ||||
| ---
 | ||||
|  pve-backup.c | 8 ++++++-- | ||||
|  1 file changed, 6 insertions(+), 2 deletions(-) | ||||
| 
 | ||||
| diff --git a/pve-backup.c b/pve-backup.c
 | ||||
| index 5bdfd1fedd..64a9406cee 100644
 | ||||
| --- a/pve-backup.c
 | ||||
| +++ b/pve-backup.c
 | ||||
| @@ -962,6 +962,8 @@ UuidInfo *qmp_backup(
 | ||||
|          .backup_file = backup_file, | ||||
|          .has_password = has_password, | ||||
|          .password = password, | ||||
| +        .has_keyfile = has_keyfile,
 | ||||
| +        .keyfile = keyfile,
 | ||||
|          .has_key_password = has_key_password, | ||||
|          .key_password = key_password, | ||||
|          .has_fingerprint = has_fingerprint, | ||||
| @@ -972,6 +974,10 @@ UuidInfo *qmp_backup(
 | ||||
|          .backup_time = backup_time, | ||||
|          .has_use_dirty_bitmap = has_use_dirty_bitmap, | ||||
|          .use_dirty_bitmap = use_dirty_bitmap, | ||||
| +        .has_compress = has_compress,
 | ||||
| +        .compress = compress,
 | ||||
| +        .has_encrypt = has_encrypt,
 | ||||
| +        .encrypt = encrypt,
 | ||||
|          .has_format = has_format, | ||||
|          .format = format, | ||||
|          .has_config_file = has_config_file, | ||||
| @@ -980,8 +986,6 @@ UuidInfo *qmp_backup(
 | ||||
|          .firewall_file = firewall_file, | ||||
|          .has_devlist = has_devlist, | ||||
|          .devlist = devlist, | ||||
| -        .has_compress = has_compress,
 | ||||
| -        .has_encrypt = has_encrypt,
 | ||||
|          .has_speed = has_speed, | ||||
|          .speed = speed, | ||||
|          .errp = errp, | ||||
							
								
								
									
										1
									
								
								debian/patches/series
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								debian/patches/series
									
									
									
									
										vendored
									
									
								
							| @ -44,3 +44,4 @@ pve/0042-PVE-use-proxmox_backup_check_incremental.patch | ||||
| pve/0043-PVE-fixup-pbs-backup-add-compress-and-encrypt-option.patch | ||||
| pve/0044-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch | ||||
| pve/0045-PVE-add-query_proxmox_support-QMP-command.patch | ||||
| pve/0046-pbs-fix-missing-crypt-and-compress-parameters.patch | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Wolfgang Bumiller
						Wolfgang Bumiller