From 98102832789412f567a96693dfe27b0e00cc98e5 Mon Sep 17 00:00:00 2001 From: Gabe Date: Wed, 14 May 2014 08:21:34 -0600 Subject: ipa-client-automount should not configure nsswitch.conf manually https://fedorahosted.org/freeipa/ticket/3733 Reviewed-By: Petr Viktorin --- ipa-client/ipa-install/ipa-client-automount | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ipa-client/ipa-install/ipa-client-automount b/ipa-client/ipa-install/ipa-client-automount index 861e92490..43b8a1a0f 100755 --- a/ipa-client/ipa-install/ipa-client-automount +++ b/ipa-client/ipa-install/ipa-client-automount @@ -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) -- cgit