napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[users] Write 127.0.1.1 entry only if there is a hostname

Browse Source
This commit is contained in:
Adriaan de Groot 2022-04-11 11:39:14 +02:00
parent 9299bedd7e
commit 3b0aa69ad3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/users/SetHostNameJob.cpp
View File

@ -61,16 +61,19 @@ STATICTEST bool
writeFileEtcHosts( const QString& hostname ) writeFileEtcHosts( const QString& hostname )
{ {
// The actual hostname gets substituted in at %1 // The actual hostname gets substituted in at %1
static const char etc_hosts[] = R"(# Host addresses const QString standard_hosts = QStringLiteral( R"(# Standard host addresses
127.0.0.1 localhost 127.0.0.1 localhost
127.0.1.1 %1
::1 localhost ip6-localhost ip6-loopback ::1 localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes ff02::1 ip6-allnodes
ff02::2 ip6-allrouters ff02::2 ip6-allrouters
)"; )" );
const QString this_host = QStringLiteral( R"(# This host address
127.0.1.1 %1
)" );
const QString etc_hosts = standard_hosts + ( hostname.isEmpty() ? QString() : this_host.arg( hostname ) );
return CalamaresUtils::System::instance()->createTargetFile( return CalamaresUtils::System::instance()->createTargetFile(
QStringLiteral( "/etc/hosts" ), QString( etc_hosts ).arg( hostname ).toUtf8(), WriteMode::Overwrite ); QStringLiteral( "/etc/hosts" ), etc_hosts.toUtf8(), WriteMode::Overwrite );
} }
STATICTEST bool STATICTEST bool