From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup] unbreak get_subscription without sshd installed
Date: Tue, 10 Nov 2020 16:59:27 +0100 [thread overview]
Message-ID: <20201110155927.2650445-1-f.gruenbichler@proxmox.com> (raw)
which might be the case e.g. in a PBS container
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
Notes:
we might want to switch to a different file as base? or even generate a file
just for the server ID derivation?
src/api2/node/subscription.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/api2/node/subscription.rs b/src/api2/node/subscription.rs
index 67797fd5..010a0209 100644
--- a/src/api2/node/subscription.rs
+++ b/src/api2/node/subscription.rs
@@ -94,7 +94,7 @@ pub fn get_subscription(
Ok(None) => SubscriptionInfo {
status: SubscriptionStatus::NOTFOUND,
message: Some("There is no subscription key".into()),
- serverid: Some(tools::get_hardware_address()?),
+ serverid: tools::get_hardware_address().ok(),
url: Some(url.into()),
..Default::default()
},
--
2.20.1
next reply other threads:[~2020-11-10 15:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-10 15:59 Fabian Grünbichler [this message]
2020-11-10 16:01 ` Dietmar Maurer
2020-11-10 16:52 ` Fabian Grünbichler
2020-11-10 16:54 ` Thomas Lamprecht
2020-11-10 17:23 ` Fabian Grünbichler
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=20201110155927.2650445-1-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pbs-devel@lists.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