diff options
author | Jakub Hrozek <jhrozek@redhat.com> | 2012-10-29 10:06:45 +0100 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2012-11-14 11:02:04 +0100 |
commit | 33fb94982665a23d38c7e51e17f632f3bc6f47bd (patch) | |
tree | af237c3ce319df86b6e8c1b0be42a2efd8436a93 /ipa-client/ipa-install | |
parent | 1bf537db9e6e5a66a7c3ce58019693098ff090f7 (diff) | |
download | freeipa-33fb94982665a23d38c7e51e17f632f3bc6f47bd.tar.gz freeipa-33fb94982665a23d38c7e51e17f632f3bc6f47bd.tar.xz freeipa-33fb94982665a23d38c7e51e17f632f3bc6f47bd.zip |
Make enabling the autofs service more robust
Diffstat (limited to 'ipa-client/ipa-install')
-rwxr-xr-x | ipa-client/ipa-install/ipa-client-automount | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/ipa-client/ipa-install/ipa-client-automount b/ipa-client/ipa-install/ipa-client-automount index 182f9f659..fd922b8a9 100755 --- a/ipa-client/ipa-install/ipa-client-automount +++ b/ipa-client/ipa-install/ipa-client-automount @@ -154,14 +154,19 @@ def configure_autofs_sssd(fstore, statestore, autodiscover, options): except Exception, e: sys.exit(e) - if 'autofs' not in sssdconfig.list_services(): - sssdconfig.new_service('autofs') - try: - sssdconfig.activate_service('autofs') - except SSSDConfig.NoServiceError: - print "Unable to activate the autofs service in SSSD config." - root_logger.debug("Unable to activate the autofs service in SSSD config.") + sssdconfig.new_service('autofs') + except SSSDConfig.ServiceAlreadyExists: + pass + except SSSDConfig.ServiceNotRecognizedError: + root_logger.error("Unable to activate the Autofs service in SSSD config.") + root_logger.info( + "Please make sure you have SSSD built with autofs support installed.") + root_logger.info( + "Configure autofs support manually in /etc/sssd/sssd.conf.") + sys.exit("Cannot create the autofs service in sssd.conf") + + sssdconfig.activate_service('autofs') domain = None for name in domains: |