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

[users] Imporove enum-naming

Browse Source
This commit is contained in:
Adriaan de Groot 2020-02-17 16:46:06 +01:00
parent e74831fcb4
commit 49eb8212e3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,7 @@ SetHostNameJob::exec()
} }
} }
if ( m_actions & Action::EtcHosts ) if ( m_actions & Action::WriteEtcHosts )
{ {
if ( !writeFileEtcHosts( m_hostname ) ) if ( !writeFileEtcHosts( m_hostname ) )
{ {

2
src/modules/users/SetHostNameJob.h
View File

@ -31,7 +31,7 @@ public:
None = 0x0, None = 0x0,
EtcHostname = 0x1, // Write to /etc/hostname directly EtcHostname = 0x1, // Write to /etc/hostname directly
SystemdHostname = 0x2, // Set via hostnamed(1) SystemdHostname = 0x2, // Set via hostnamed(1)
EtcHosts = 0x4 // Write /etc/hosts (127.0.1.1 is this host) WriteEtcHosts = 0x4 // Write /etc/hosts (127.0.1.1 is this host)
}; };
Q_DECLARE_FLAGS( Actions, Action ) Q_DECLARE_FLAGS( Actions, Action )

2
src/modules/users/UsersViewStep.cpp
View File

@ -220,6 +220,6 @@ UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap )
hostnameAction = Action::EtcHostname; hostnameAction = Action::EtcHostname;
} }
Action hostsfileAction = getBool( configurationMap, "writeHostsFile", true ) ? Action::EtcHosts : Action::None; Action hostsfileAction = getBool( configurationMap, "writeHostsFile", true ) ? Action::WriteEtcHosts : Action::None;
m_actions = hostsfileAction | hostnameAction; m_actions = hostsfileAction | hostnameAction;
} }