Add interactive prompts to ipa-server-install

Change unattended flag to be -U
Change master password flag to be -P instead of -m
Improve ipa-client-install readability for user prompts

1 files changed, 3 insertions, 3 deletions

diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index d50a736b5..0f399c48f 100644
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -37,7 +37,7 @@ def parse_options():
     parser.add_option("--realm", dest="realm_name", help="realm name")
     parser.add_option("-d", "--debug", dest="debug", action="store_true",
                      dest="debug", default=False, help="print debugging information")
-    parser.add_option("-u", "--unattended", dest="unattended",
+    parser.add_option("-U", "--unattended", dest="unattended",
                      help="unattended installation never prompts the user")
 
     options, args = parser.parse_args()
@@ -83,7 +83,7 @@ def main():
             return ret
         else:
             print "Failed to determine your DNS domain (DNS misconfigured?)"
-            dom = raw_input("Please provide your domain name (ex: example.com):")
+            dom = raw_input("Please provide your domain name (ex: example.com): ")
         ret = ds.search(domain=dom)
         if ret == -2:
             logging.debug("IPA Server not found")
@@ -93,7 +93,7 @@ def main():
                 return ret
             else:
                 print "Failed to find the IPA Server (DNS misconfigured?)"
-                srv = raw_input("Please provide your server name (ex: ipa.example.com):")
+                srv = raw_input("Please provide your server name (ex: ipa.example.com): ")
             ret = ds.search(domain=dom, server=srv)
             if ret != 0:
                 print "Failed to verify that "+srv+" is an IPA Server, aborting!"