From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 245179ADB6 for ; Tue, 23 May 2023 09:14:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F2FAC37CC7 for ; Tue, 23 May 2023 09:14:24 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 23 May 2023 09:14:24 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4683646A1C for ; Tue, 23 May 2023 09:14:24 +0200 (CEST) From: Leo Nunner To: pve-devel@lists.proxmox.com Date: Tue, 23 May 2023 09:14:19 +0200 Message-Id: <20230523071419.46528-1-l.nunner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.125 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [cloudinit.pm] Subject: [pve-devel] [PATCH qemu-server] cloudinit: pass through hostname via fqdn field X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 May 2023 07:14:55 -0000 If no FQDN is provided, we simply set it to the current hostname. This ensures that the hostname *really* gets set, since we encountered an issue on Fedora and CentOS based systems where no hostname got set at all. When there's no FQDN set in the cloudinit config, this leads to the following entry: 127.0.1.1 Which doesn't seem to cause any issues. Tested on: - Ubuntu 23.04 - CentOS 8 - Fedora 38 - Debian 11 - SUSE 15.4 Signed-off-by: Leo Nunner --- PVE/QemuServer/Cloudinit.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm index a0c3d60..88888d7 100644 --- a/PVE/QemuServer/Cloudinit.pm +++ b/PVE/QemuServer/Cloudinit.pm @@ -87,6 +87,8 @@ sub get_hostname_fqdn { $hostname =~ s/\..*$//; } elsif (my $search = $conf->{searchdomain}) { $fqdn = "$hostname.$search"; + } else { + $fqdn = $hostname; } return ($hostname, $fqdn); } @@ -120,7 +122,7 @@ sub cloudinit_userdata { $content .= "hostname: $hostname\n"; $content .= "manage_etc_hosts: true\n"; - $content .= "fqdn: $fqdn\n" if defined($fqdn); + $content .= "fqdn: $fqdn\n"; my $username = $conf->{ciuser}; my $password = $conf->{cipassword}; -- 2.30.2