public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Stoiko Ivanov <s.ivanov@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] applied: [PATCH proxmox-backup] pbs2to3: fix boot-mode detection
Date: Fri, 11 Aug 2023 09:34:38 +0200	[thread overview]
Message-ID: <k5kayol3iayv7j34f7lweb6mvynopietsd3bdxm7syomspq4dt@de3fy6vpiuh5> (raw)
In-Reply-To: <20230809103426.24142-1-s.ivanov@proxmox.com>

applied, thanks

On Wed, Aug 09, 2023 at 10:34:26AM +0000, Stoiko Ivanov wrote:
> /sys/firmware/efi is a directory and std::path::Path seems to detect
> only regular files with is_file [0].
> 
> Reported in our Enterprise support portal.
> 
> Quickly tested the fix on a VM.
> 
> https://doc.rust-lang.org/stable/std/path/struct.Path.html#method.is_file
> 
> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
> ---
> technically only needed on master - since the check is not run before
> the upgrade

picked into stable-2 anyway for the sake of keeping them in sync for
potential future patch conflicts

>  src/bin/pbs2to3.rs | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/bin/pbs2to3.rs b/src/bin/pbs2to3.rs
> index a052ae3a..9a18d7b2 100644
> --- a/src/bin/pbs2to3.rs
> +++ b/src/bin/pbs2to3.rs
> @@ -203,7 +203,7 @@ impl Checker {
>              return Ok(());
>          }
>  
> -        if !Path::new("/sys/firmware/efi").is_file() {
> +        if !Path::new("/sys/firmware/efi").is_dir() {
>              self.output
>                  .log_skip("System booted in legacy-mode - no need for systemd-boot")?;
>              return Ok(());
> -- 
> 2.39.2




      reply	other threads:[~2023-08-11  7:35 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-09 10:34 [pbs-devel] " Stoiko Ivanov
2023-08-11  7:34 ` Wolfgang Bumiller [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=k5kayol3iayv7j34f7lweb6mvynopietsd3bdxm7syomspq4dt@de3fy6vpiuh5 \
    --to=w.bumiller@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    --cc=s.ivanov@proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal