summaryrefslogtreecommitdiffstats
path: root/ipaplatform/base
diff options
context:
space:
mode:
authorNathan Kinder <nkinder@redhat.com>2015-02-25 15:19:47 -0800
committerMartin Kosek <mkosek@redhat.com>2015-03-16 15:55:26 +0100
commita58b77ca9cd3620201306258dd6bd05ea1c73c73 (patch)
tree5de232c8838d8b4884e6c3da9a59834597eb2d1b /ipaplatform/base
parentfbf192f0e255c5f48e93f8838fc530b26f357deb (diff)
downloadfreeipa-a58b77ca9cd3620201306258dd6bd05ea1c73c73.tar.gz
freeipa-a58b77ca9cd3620201306258dd6bd05ea1c73c73.tar.xz
freeipa-a58b77ca9cd3620201306258dd6bd05ea1c73c73.zip
Timeout when performing time sync during client install
We use ntpd now to sync time before fetching a TGT during client install. Unfortuantely, ntpd will hang forever if it is unable to reach the NTP server. This patch adds the ability for commands run via ipautil.run() to have an optional timeout. This capability is used by the NTP sync code that is run during ipa-client-install. Ticket: https://fedorahosted.org/freeipa/ticket/4842 Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Diffstat (limited to 'ipaplatform/base')
-rw-r--r--ipaplatform/base/paths.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
index 7922e3bbc..11c7e9212 100644
--- a/ipaplatform/base/paths.py
+++ b/ipaplatform/base/paths.py
@@ -186,6 +186,7 @@ class BasePathNamespace(object):
SSLGET = "/usr/bin/sslget"
SSS_SSH_AUTHORIZEDKEYS = "/usr/bin/sss_ssh_authorizedkeys"
SSS_SSH_KNOWNHOSTSPROXY = "/usr/bin/sss_ssh_knownhostsproxy"
+ BIN_TIMEOUT = "/usr/bin/timeout"
UPDATE_CA_TRUST = "/usr/bin/update-ca-trust"
BIN_WGET = "/usr/bin/wget"
ZIP = "/usr/bin/zip"