diff options
| author | Martin Nagy <mnagy@redhat.com> | 2009-11-13 16:57:51 +0100 |
|---|---|---|
| committer | Martin Nagy <mnagy@redhat.com> | 2009-12-02 13:07:07 +0100 |
| commit | d147eafb075ae4207f95cdbea78697178b4bb68e (patch) | |
| tree | c1c1272b601cce29e31c4916fb656d3e0bb52562 /install | |
| parent | 377907e2211875250e6af7fcb65d0548702c3c3d (diff) | |
| download | freeipa-d147eafb075ae4207f95cdbea78697178b4bb68e.tar.gz freeipa-d147eafb075ae4207f95cdbea78697178b4bb68e.tar.xz freeipa-d147eafb075ae4207f95cdbea78697178b4bb68e.zip | |
Ask the user before overwriting /etc/named.conf
Diffstat (limited to 'install')
| -rwxr-xr-x | install/tools/ipa-replica-install | 6 | ||||
| -rwxr-xr-x | install/tools/ipa-server-install | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index ae6137d01..33d3726c2 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 5ea8a1b04..0694d6ed5 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: |