install: Call hostnamectl set-hostname only if --hostname option is used

This commit also splits hostname backup and configuration into two separate
functions. This allows us to backup hostname without setting it at the
same time.

https://fedorahosted.org/freeipa/ticket/6071

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Petr Spacek
2016-07-28 16:13:55 +02:00
committed by Jan Cholasta
parent a83523e37e
commit 80e544e7a9
5 changed files with 16 additions and 27 deletions

View File

@@ -2525,7 +2525,8 @@ def install(options, env, fstore, statestore):
if options.hostname and not options.on_master:
# skip this step when run by ipa-server-install as it always configures
# hostname
tasks.backup_and_replace_hostname(fstore, statestore, options.hostname)
tasks.backup_hostname(fstore, statestore)
tasks.set_hostname(options.hostname)
ntp_srv_servers = []
if not options.on_master and options.conf_ntp: