IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix case where a question was being asked in unattended mode.

Browse Source 
Catch permission errors on install.
Initialize srv so the error message works if the user presses enter
This commit is contained in:
Rob Crittenden 2008-01-17 16:36:05 -05:00
parent f45ded96a6
commit aaa3cfd58c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ipa-client/ipa-install/ipa-client-install
View File

@ -43,6 +43,7 @@ def parse_options():
parser.add_option("-d", "--debug", dest="debug", action="store_true", parser.add_option("-d", "--debug", dest="debug", action="store_true",
default=False, help="print debugging information") default=False, help="print debugging information")
parser.add_option("-U", "--unattended", dest="unattended", parser.add_option("-U", "--unattended", dest="unattended",
action="store_true",
help="unattended installation never prompts the user") help="unattended installation never prompts the user")
parser.add_option("-N", "--no-ntp", action="store_false", parser.add_option("-N", "--no-ntp", action="store_false",
help="do not configure ntp", default=True, dest="conf_ntp") help="do not configure ntp", default=True, dest="conf_ntp")
@ -86,6 +87,7 @@ def main():
ds = ipaclient.ipadiscovery.IPADiscovery() ds = ipaclient.ipadiscovery.IPADiscovery()
ret = ds.search() ret = ds.search()
srv = ""
if ret == -10: if ret == -10:
print "Can't get the fully qualified name of this host" print "Can't get the fully qualified name of this host"
print "Please check that the client is properly configured" print "Please check that the client is properly configured"
@ -130,7 +132,7 @@ def main():
print "BaseDN: "+ds.getBaseDN() print "BaseDN: "+ds.getBaseDN()
print "\n" print "\n"
if not ask_for_confirmation("Continue to configure the system with these values?"): if not options.unattended and not ask_for_confirmation("Continue to configure the system with these values?"):
return 1 return 1
# Configure ipa.conf # Configure ipa.conf
@ -164,7 +166,11 @@ def main():
opts.append({'name':'uri', 'type':'option', 'value':'ldap://'+ds.getServerName()}) opts.append({'name':'uri', 'type':'option', 'value':'ldap://'+ds.getServerName()})
opts.append({'name':'empty', 'type':'empty'}) opts.append({'name':'empty', 'type':'empty'})
ldapconf.newConf("/etc/ldap.conf", opts) try:
ldapconf.newConf("/etc/ldap.conf", opts)
except Exception, e:
print "Configuration failed: " + str(e)
return 1
#Check if kerberos is already configured properly #Check if kerberos is already configured properly
krbctx = krbV.default_context() krbctx = krbV.default_context()
@ -232,6 +238,8 @@ def main():
if options.conf_ntp: if options.conf_ntp:
ipaclient.ntpconf.config_ntp(ds.getServerName()) ipaclient.ntpconf.config_ntp(ds.getServerName())
print "Client configuration complete."
return 0 return 0
sys.exit(main()) sys.exit(main())