Here's the simple patch for #558984.

Specifically, with this patch, ipa-server-install/ipa-dns-install will
ask you this:

Do you wish to configure DNS forwarders?

If you say yes, you will also see:

Please enter the IP addresses of DNS forwarders that you want to use.
After you are done, enter a blank line to stop.

And the rest is the same, except it doesn't say "(empty to stop)" at the
end of the prompt as it used to.

David, Jenny, do you think this is good enough? I can change it easily
if there are any objections/ideas.

Patch attached.
Martin
>From 6227f43bab6b2118c3c787496524cc8e97c744d5 Mon Sep 17 00:00:00 2001
From: Martin Nagy <[email protected]>
Date: Mon, 8 Feb 2010 19:31:57 +0100
Subject: [PATCH] Make the DNS forwarders interactive input less confusing

Fixes #558984
---
 ipaserver/install/installutils.py |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index 6365fe8..df3c891 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -151,19 +151,23 @@ def read_ip_address(host_name, fstore):
 
 def read_dns_forwarders():
     addrs = []
-    while True:
-        ip = ipautil.user_input("Enter IP address for a DNS forwarder (empty to stop)", allow_empty=True)
-
-        if not ip:
-            break
-        if ip == "127.0.0.1" or ip == "::1":
-            print "You cannot use localhost as a DNS forwarder"
-            continue
-        if not verify_ip_address(ip):
-            continue
-
-        print "DNS forwarder %s added" % ip
-        addrs.append(ip)
+    if ipautil.user_input("Do you wish to configure DNS forwarders?", False):
+        print "Please enter the IP addresses of DNS forwarders that you want to use."
+        print "After you are done, enter a blank line to stop."
+
+        while True:
+            ip = ipautil.user_input("Enter IP address for a DNS forwarder",
+                                    allow_empty=True)
+            if not ip:
+                break
+            if ip == "127.0.0.1" or ip == "::1":
+                print "You cannot use localhost as a DNS forwarder"
+                continue
+            if not verify_ip_address(ip):
+                continue
+
+            print "DNS forwarder %s added" % ip
+            addrs.append(ip)
 
     if not addrs:
         print "No DNS forwarders configured"
-- 
1.6.2.5

_______________________________________________
Freeipa-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to