github-featured/webmin--webmin
2
0
Fork 0
Code Issues Pull Requests Deployments Models Agent Notes Packages Projects Releases Wiki Activity

Fix FQDN detection on systemd systems

Browse Source 
ⓘ Do not return a short name from /etc/hostname when the full name is requested; resolve it with hostname -f first, honoring the no_hostname_f option, and otherwise fall back to the existing file-based logic.

Also check for /run/systemd/system instead of reading /proc/1/comm as it's much cheaper.

Fixes #2054
This commit is contained in:
Ilia Ross
2026-08-21 19:37:47 +02:00
parent 72f1e7dc32
commit 3c26b2be3b
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web-lib-funcs.pl
+16 -2
View File
@@ -4859,11 +4859,25 @@ return if ($nocache == 2);
if (!$system_hostname[$m]) {
if ($gconfig{'os_type'} ne 'windows') {
# If systemd system try /etc/hostname straight away
my $initsys = &trim(&backquote_command("cat /proc/1/comm 2>/dev/null"));
if ($initsys eq 'systemd') {
if (-d "/run/systemd/system") {
my $hostname = &read_file_contents("/etc/hostname");
$hostname =~ s/\r|\n//g;
# Cache the short name before resolving the full name
if ($hostname) {
my $shortname = $hostname;
$shortname =~ s/\..*$//;
$system_hostname[1] = $shortname;
}
# Resolve a short static hostname before caching it
if ($hostname && !$m && $hostname !~ /\./ &&
!$gconfig{'no_hostname_f'}) {
my $fqdn;
my $ex = &execute_command("hostname -f", undef,
\$fqdn, undef, 0, 1);
$fqdn = &trim($fqdn);
$hostname = $fqdn if (!$ex && $fqdn =~ /\./);
}
if ($hostname && ($m || $hostname =~ /\./)) {
$hostname =~ s/\..*$// if ($m);
$system_hostname[$m] = $hostname;
return $hostname;