summaryrefslogtreecommitdiffstats
path: root/ipa-client/ipa-install
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2011-10-13 12:16:15 +0200
committerRob Crittenden <rcritten@redhat.com>2011-10-13 00:56:17 -0400
commitb8eafa43ac529a40e4c47005cb93adc1dec40b13 (patch)
treeead2df0153da0f3d65ac95e3699552ecc16a2839 /ipa-client/ipa-install
parent93feb5293236a5d0e22ae15eee35e7b9eb93e6e4 (diff)
downloadfreeipa-b8eafa43ac529a40e4c47005cb93adc1dec40b13.tar.gz
freeipa-b8eafa43ac529a40e4c47005cb93adc1dec40b13.tar.xz
freeipa-b8eafa43ac529a40e4c47005cb93adc1dec40b13.zip
Hostname used by IPA must be a system hostname
Make sure that the hostname IPA uses is a system hostname. If user passes a non-system hostname, update the network settings and system hostname in the same way that ipa-client-install does. This step should prevent various services failures which may not be ready to talk to IPA with non-system hostname. https://fedorahosted.org/freeipa/ticket/1931
Diffstat (limited to 'ipa-client/ipa-install')
-rwxr-xr-xipa-client/ipa-install/ipa-client-install4
1 files changed, 3 insertions, 1 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index 2080e7858..d6e48c5d8 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -955,8 +955,10 @@ def install(options, env, fstore, statestore):
if not options.unattended and not user_input("Continue to configure the system with these values?", False):
return CLIENT_INSTALL_ERROR
- if options.hostname:
+ if options.hostname and not options.on_master:
# configure /etc/sysconfig/network to contain the hostname we set.
+ # skip this step when run by ipa-server-install as it always configures
+ # hostname if different from system hostname
ipaservices.backup_and_replace_hostname(fstore, statestore, options.hostname)
if not options.unattended: