IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-26 16:16:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipa-client-automount should not configure nsswitch.conf manually

Browse Source 
https://fedorahosted.org/freeipa/ticket/3733

Reviewed-By: Petr Viktorin <pviktori@redhat.com>
This commit is contained in:
Gabe 2014-05-14 08:21:34 -06:00 committed by Petr Viktorin
parent 2478aa42a0
commit 9810283278
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipa-client/ipa-install/ipa-client-automount
View File

@ -129,17 +129,15 @@ def configure_xml(fstore):
def configure_nsswitch(fstore, options):
"""
Point automount to ldap in nsswitch.conf
Point automount to ldap in nsswitch.conf. This function is for non-SSSD
setups only
"""
fstore.backup_file(NSSWITCH_CONF)
conf = ipachangeconf.IPAChangeConf("IPA Installer")
conf.setOptionAssignment(':')
if options.sssd:
nss_value = ' sss files'
else:
nss_value = ' ldap files'
nss_value = ' files ldap'
opts = [{'name':'automount', 'type':'option', 'action':'set', 'value':nss_value},
{'name':'empty', 'type':'empty'}]
@ -459,7 +457,8 @@ def main():
sys.exit("Installation aborted")
try:
configure_nsswitch(fstore, options)
if not options.sssd:
configure_nsswitch(fstore, options)
configure_nfs(fstore, statestore)
if options.sssd:
configure_autofs_sssd(fstore, statestore, autodiscover, options)