[users] Document change to config, document TODO:3.3

This commit is contained in:
Adriaan de Groot 2022-04-11 10:14:32 +02:00
parent 8a8ac4fe2b
commit 99bf5497ca
3 changed files with 9 additions and 1 deletions

View File

@ -17,7 +17,9 @@ This release contains contributions from (alphabetically by first name):
- No core changes yet - No core changes yet
## Modules ## ## Modules ##
- No module changes yet - *users* module has rearranged configuration for setting the hostname.
Legacy settings are preserved, but produce a warning. Please see
`users.conf` for details.
# 3.2.54 (2022-03-21) # # 3.2.54 (2022-03-21) #

View File

@ -826,6 +826,7 @@ either( T ( *f )( const QVariantMap&, const QString&, U ),
} }
} }
// TODO:3.3: Remove
static void static void
copyLegacy( const QVariantMap& source, const QString& sourceKey, QVariantMap& target, const QString& targetKey ) copyLegacy( const QVariantMap& source, const QString& sourceKey, QVariantMap& target, const QString& targetKey )
{ {
@ -860,6 +861,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
bool ok = false; // Ignored bool ok = false; // Ignored
QVariantMap hostnameSettings = CalamaresUtils::getSubMap( configurationMap, "hostname", ok ); QVariantMap hostnameSettings = CalamaresUtils::getSubMap( configurationMap, "hostname", ok );
// TODO:3.3: Remove calls to copyLegacy
copyLegacy( configurationMap, "setHostname", hostnameSettings, "location" ); copyLegacy( configurationMap, "setHostname", hostnameSettings, "location" );
copyLegacy( configurationMap, "writeHostsFile", hostnameSettings, "writeHostsFile" ); copyLegacy( configurationMap, "writeHostsFile", hostnameSettings, "writeHostsFile" );
m_hostNameActions = getHostNameActions( hostnameSettings ); m_hostNameActions = getHostNameActions( hostnameSettings );

View File

@ -171,10 +171,14 @@ hostname:
location: EtcFile location: EtcFile
writeHostsFile: true writeHostsFile: true
# TODO:3.3: Remove this setting
#
# This is a legacy setting for hostname.location; if it is set # This is a legacy setting for hostname.location; if it is set
# at all, and there is no setting for hostname.location, it is used. # at all, and there is no setting for hostname.location, it is used.
setHostname: EtcFile setHostname: EtcFile
# TODO:3.3: Remove this setting
#
# This is a legacy setting for hostname.writeHostsFile # This is a legacy setting for hostname.writeHostsFile
writeHostsFile: true writeHostsFile: true