diff options
| author | Stanislav Laznicka <slaznick@redhat.com> | 2016-09-21 14:19:55 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-09-22 10:28:45 +0200 |
| commit | 2e0afab5f2a47149580b4bc79093cdbb77f489c3 (patch) | |
| tree | aa0fc092aeb69b36cc16c72654f370347bc82511 | |
| parent | a7c49e455e4f1f06f621f4c634a79b3ae0585cd8 (diff) | |
| download | freeipa-2e0afab5f2a47149580b4bc79093cdbb77f489c3.tar.gz freeipa-2e0afab5f2a47149580b4bc79093cdbb77f489c3.tar.xz freeipa-2e0afab5f2a47149580b4bc79093cdbb77f489c3.zip | |
Updated help/man information about hostname
The man page and help of ipa-client-install and ipa-replica-conncheck
had an outdated information about what is used as a hostname.
https://fedorahosted.org/freeipa/ticket/5754
Reviewed-By: Tomas Krizek <tkrizek@redhat.com>
| -rwxr-xr-x | client/ipa-client-install | 3 | ||||
| -rw-r--r-- | client/man/ipa-client-install.1 | 2 | ||||
| -rwxr-xr-x | install/tools/ipa-replica-conncheck | 3 | ||||
| -rw-r--r-- | install/tools/man/ipa-replica-conncheck.1 | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/client/ipa-client-install b/client/ipa-client-install index 8f5f81f8c..3d7e31dc4 100755 --- a/client/ipa-client-install +++ b/client/ipa-client-install @@ -136,7 +136,8 @@ def parse_options(): basic_group.add_option("", "--hostname", dest="hostname", help="The hostname of this machine (FQDN). If specified, the hostname will be set and " "the system configuration will be updated to persist over reboot. " - "By default a nodename result from uname(2) is used.") + "By default the result of getfqdn() call from " + "Python's socket module is used.") basic_group.add_option("", "--force-join", dest="force_join", action="store_true", default=False, help="Force client enrollment even if already enrolled") diff --git a/client/man/ipa-client-install.1 b/client/man/ipa-client-install.1 index 7f490d153..26c940721 100644 --- a/client/man/ipa-client-install.1 +++ b/client/man/ipa-client-install.1 @@ -111,7 +111,7 @@ Path to backed up host keytab from previous enrollment. Joins the host even if i Configure PAM to create a users home directory if it does not exist. .TP \fB\-\-hostname\fR -The hostname of this machine (FQDN). If specified, the hostname will be set and the system configuration will be updated to persist over reboot. By default a nodename result from uname(2) is used. +The hostname of this machine (FQDN). If specified, the hostname will be set and the system configuration will be updated to persist over reboot. By default the result of getfqdn() call from Python's socket module is used. .TP \fB\-\-force\-join\fR Join the host even if it is already enrolled. diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck index 6f69cc815..a192bbf1a 100755 --- a/install/tools/ipa-replica-conncheck +++ b/install/tools/ipa-replica-conncheck @@ -172,7 +172,8 @@ def parse_options(): common_group.add_option("", "--hostname", dest="hostname", help="The hostname of this server (FQDN). " - "By default a nodename from uname(2) is used.") + "By default the result of getfqdn() call from " + "Python's socket module is used.") parser.add_option_group(common_group) parser.add_option("-d", "--debug", dest="debug", diff --git a/install/tools/man/ipa-replica-conncheck.1 b/install/tools/man/ipa-replica-conncheck.1 index e948d7919..4fc55e8bf 100644 --- a/install/tools/man/ipa-replica-conncheck.1 +++ b/install/tools/man/ipa-replica-conncheck.1 @@ -60,7 +60,7 @@ Remote replica machine address Include in a check also a set of dogtag connection requirements. Only needed when the master was installed with Dogtag 9 or lower. .TP \fB\-h\fR \fIHOSTNAME\fR, \fB\-\-hostname\fR=\fIHOSTNAME\fR -The hostname of this server (FQDN). By default a nodename from uname(2) is used +The hostname of this server (FQDN). By default the result of getfqdn() call from Python's socket module is used. .TP \fB\-d\fR, \fB\-\-debug\fR Print debugging information |