[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 at 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 at proxmox.com>