From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH installer] run env: do not store emtpy hostname
Date: Thu, 16 Nov 2023 20:59:47 +0100 [thread overview]
Message-ID: <20231116195947.1538515-1-s.ivanov@proxmox.com> (raw)
without this patch the hostname ends up as the empty string in
run-env-info.json, which results in a parse-error in the TUI code
(an empty string is not None, but still too short as hostname)
Minimally tested on a VM.
Fixes: bda1cdf699a3fcfc1cf3cfa446b1493689fc8eb8
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
Proxmox/Install/RunEnv.pm | 4 +++-
Proxmox/Sys/Net.pm | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Proxmox/Install/RunEnv.pm b/Proxmox/Install/RunEnv.pm
index 5f68d82..2d91401 100644
--- a/Proxmox/Install/RunEnv.pm
+++ b/Proxmox/Install/RunEnv.pm
@@ -268,7 +268,9 @@ sub query_installation_environment : prototype() {
};
# Cannot be put directly in the above hash as it might return undef ..
- $output->{network}->{hostname} = Proxmox::Sys::Net::get_dhcp_hostname();
+ if ( my $hostname = Proxmox::Sys::Net::get_dhcp_hostname()) {
+ $output->{network}->{hostname} = $hostname;
+ }
# FIXME: move whatever makes sense over to Proxmox::Sys::Net:: and keep that as single source,
# it can then use some different structure just fine (after adapting the GTK GUI to that) but
diff --git a/Proxmox/Sys/Net.pm b/Proxmox/Sys/Net.pm
index 35d2abd..7415bf9 100644
--- a/Proxmox/Sys/Net.pm
+++ b/Proxmox/Sys/Net.pm
@@ -211,7 +211,7 @@ sub get_dhcp_hostname : prototype() {
}
close($fh);
- return $1 if defined($name) && $name =~ m/^([^\.]+)(?:\.(?:\S+))?$/;
+ return $name if defined($name) && $name =~ m/^([^\.]+)(?:\.(?:\S+))?$/;
}
1;
--
2.39.2
next reply other threads:[~2023-11-16 20:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-16 19:59 Stoiko Ivanov [this message]
2023-11-17 5:37 ` [pve-devel] applied: " Thomas Lamprecht
2023-11-17 10:11 ` Christoph Heiss
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=20231116195947.1538515-1-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pve-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