From d147eafb075ae4207f95cdbea78697178b4bb68e Mon Sep 17 00:00:00 2001 From: Martin Nagy Date: Fri, 13 Nov 2009 16:57:51 +0100 Subject: Ask the user before overwriting /etc/named.conf --- install/tools/ipa-replica-install | 6 ++---- install/tools/ipa-server-install | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'install/tools') diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index ae6137d0..33d3726c 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -251,10 +251,8 @@ def check_dirsrv(): sys.exit(1) def check_bind(): - if not bindinstance.check_inst(): - print "--setup-dns was specified but bind or the BIND LDAP plug-in" - print "is not installed on the system" - print "Please install bind and the LDAP plug-in and restart the setup program" + if not bindinstance.check_inst(unattended=True): + print "Aborting installation" sys.exit(1) def main(): diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 5ea8a1b0..0694d6ed 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -541,10 +541,8 @@ def main(): # check bind packages are installed if options.setup_dns: - if not bindinstance.check_inst(): - print "--setup-dns was specified but bind or the BIND LDAP plug-in" - print "is not installed on the system" - print "Please install bind and the LDAP plug-in and restart the setup program" + if not bindinstance.check_inst(options.unattended): + print "Aborting installation" return 1 if options.ca: -- cgit