[pbs-devel] [PATCH proxmox-backup] file-restore: fix -blockdev regression with namespaces or encryption

[pbs-devel] [PATCH proxmox-backup] file-restore: fix -blockdev regression with namespaces or encryption

[Fabian Grünbichler]

these two were missed because they were not part of the "main" format string..

Fixes: 668b8383 ("file restore: qemu helper: switch to more modern blockdev option for drives")
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 proxmox-file-restore/src/qemu_helper.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proxmox-file-restore/src/qemu_helper.rs b/proxmox-file-restore/src/qemu_helper.rs
index 1274dda35..e0e169110 100644
--- a/proxmox-file-restore/src/qemu_helper.rs
+++ b/proxmox-file-restore/src/qemu_helper.rs
@@ -281,14 +281,14 @@ pub async fn start_vm(
         }
         drives.push("-blockdev".to_owned());
         let keyfile = if let Some(ref keyfile) = details.keyfile {
-            format!(",,keyfile={keyfile}")
+            format!(",keyfile={keyfile}")
         } else {
             "".to_owned()
         };
         let namespace = if details.namespace.is_root() {
             String::new()
         } else {
-            format!(",,namespace={}", details.namespace)
+            format!(",namespace={}", details.namespace)
         };
         drives.push(format!(
             "driver=pbs,repository={}{},snapshot={},archive={}{},read-only=on,node-name=drive{}",
-- 
2.39.5



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel

Re: [pbs-devel] [PATCH proxmox-backup] file-restore: fix -blockdev regression with namespaces or encryption

[Mira Limbeck]

On 12/10/24 10:37, Fabian Grünbichler wrote:
> these two were missed because they were not part of the "main" format string..
> 
> Fixes: 668b8383 ("file restore: qemu helper: switch to more modern blockdev option for drives")
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
>  proxmox-file-restore/src/qemu_helper.rs | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/proxmox-file-restore/src/qemu_helper.rs b/proxmox-file-restore/src/qemu_helper.rs
> index 1274dda35..e0e169110 100644
> --- a/proxmox-file-restore/src/qemu_helper.rs
> +++ b/proxmox-file-restore/src/qemu_helper.rs
> @@ -281,14 +281,14 @@ pub async fn start_vm(
>          }
>          drives.push("-blockdev".to_owned());
>          let keyfile = if let Some(ref keyfile) = details.keyfile {
> -            format!(",,keyfile={keyfile}")
> +            format!(",keyfile={keyfile}")
>          } else {
>              "".to_owned()
>          };
>          let namespace = if details.namespace.is_root() {
>              String::new()
>          } else {
> -            format!(",,namespace={}", details.namespace)
> +            format!(",namespace={}", details.namespace)
>          };
>          drives.push(format!(
>              "driver=pbs,repository={}{},snapshot={},archive={}{},read-only=on,node-name=drive{}",

Tested this in my cluster, makes the file restore VM start again.

Tested-by: Mira Limbeck <m.limbeck@proxmox.com>


_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel

[pbs-devel] applied: [PATCH proxmox-backup] file-restore: fix -blockdev regression with namespaces or encryption

[Thomas Lamprecht]

Am 10.12.24 um 10:37 schrieb Fabian Grünbichler:
> these two were missed because they were not part of the "main" format string..
> 
> Fixes: 668b8383 ("file restore: qemu helper: switch to more modern blockdev option for drives")
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
>  proxmox-file-restore/src/qemu_helper.rs | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
>

applied, with Mira's T-b, thanks!

I also tried to add some more context to the commit message, but this is not described
really well in QEMU options, there's a general "you need to double commas in filenames"
(which we do not check for? albeit not a problem as long as our volume names are used),
and some obvious but uncommented hints in the util/keyval.c key-value parser.


_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel