diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2008-05-30 15:31:13 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2008-05-30 16:14:51 -0400 |
| commit | f87dc9123b692fc12ad8603726f56ef753ed496a (patch) | |
| tree | c290d31b1f5db50e6ec586857a992338e2d5a6da | |
| parent | e935287f6ea8b9b6ae8c33a074ecada156e058c9 (diff) | |
| download | freeipa-f87dc9123b692fc12ad8603726f56ef753ed496a.tar.gz freeipa-f87dc9123b692fc12ad8603726f56ef753ed496a.tar.xz freeipa-f87dc9123b692fc12ad8603726f56ef753ed496a.zip | |
Don't prompt regarding previous DS installations in unattended mode.
449150
| -rw-r--r-- | ipa-server/ipa-install/ipa-server-install | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install index de1add068..efee04b50 100644 --- a/ipa-server/ipa-install/ipa-server-install +++ b/ipa-server/ipa-install/ipa-server-install @@ -260,11 +260,13 @@ def read_admin_password(): admin_password = read_password("IPA admin") return admin_password -def check_dirsrv(): +def check_dirsrv(unattended): serverids = ipaserver.dsinstance.check_existing_installation() if serverids: print "" print "An existing Directory Server has been detected." + if unattended: + sys.exit(1) yesno = raw_input("Do you wish to remove it and create a new one? [no]: ") if not yesno or yesno.lower()[0] != "y": print "" @@ -353,7 +355,7 @@ def main(): print "To accept the default shown in brackets, press the Enter key." print "" - check_dirsrv() + check_dirsrv(options.unattended) ds_user = "" realm_name = "" |