[389-commits] ldap/admin

[Nathan Kinder]

 ldap/admin/src/scripts/setup-ds.res.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 53794a074af7c26c0b49ca700de5a5071c490d3d
Author: Nathan Kinder <nkinder at redhat.com>
Date:   Thu Jan 20 15:10:09 2011 -0800

    Bug 527912 - setup-ds.pl appears to hang when DNS is unreachable
    
    The setup-ds.pl program will appear to hang when it attempts to
    contact an unreachable DNS server to determine the FQDN.  The
    hostname prompt will eventually be displayed after a network
    timeout is hit.
    
    This patch makes the setup program log a warning message just
    prior to trying to determine the FQDN.  This message states that
    setup may appear to hang if it can't reach the DNS servers, and
    that one can re-run setup and pass the hostname as an option on
    the command line instead.

diff --git a/ldap/admin/src/scripts/setup-ds.res.in b/ldap/admin/src/scripts/setup-ds.res.in
index 25f8493..344fcf9 100644
--- a/ldap/admin/src/scripts/setup-ds.res.in
+++ b/ldap/admin/src/scripts/setup-ds.res.in
@@ -33,7 +33,7 @@ dialog_setuptype_error = Invalid setup type\n\n
 
 
 # ----------- HostName Dialog Resource  ----------------
-dialog_hostname_text = Enter the fully qualified domain name of the computer\non which you're setting up server software. Using the form\n<hostname>.<domainname>\nExample: eros.example.com.\n\nTo accept the default shown in brackets, press the Enter key.\n\n
+dialog_hostname_text = Enter the fully qualified domain name of the computer\non which you're setting up server software. Using the form\n<hostname>.<domainname>\nExample: eros.example.com.\n\nTo accept the default shown in brackets, press the Enter key.\n\nWarning: This step may take a few minutes if your DNS servers\ncan not be reached or if DNS is not configured correctly.  If\nyou would rather not wait, hit Ctrl-C and run this program again\nwith the following command line option to specify the hostname:\n\n    General.FullMachineName=your.hostname.domain.name\n\n
 
 dialog_hostname_prompt = Computer name