From 29ff2868cde9f80eda62d50c0d5fc2c22541faf1 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Wed, 12 Nov 2014 12:09:27 +0100 Subject: Upgrade fix: masking named should be executed only once There was error in code, masking was executed more times, even it was succesful https://fedorahosted.org/freeipa/ticket/4755 Reviewed-By: David Kupka --- install/tools/ipa-upgradeconfig | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig index 967b1f527..887d3ce99 100644 --- a/install/tools/ipa-upgradeconfig +++ b/install/tools/ipa-upgradeconfig @@ -1081,23 +1081,25 @@ def uninstall_selfsign(ds, http): def mask_named_regular(): """Disable named, we need to run only named-pkcs11, running both named and named-pkcs can cause unexpected errors""" - if not sysupgrade.get_upgrade_state('dns', 'regular_named_masked'): - if bindinstance.named_conf_exists(): - root_logger.info('[Masking named]') - named = services.service('named-regular') - try: - named.stop() - except Exception as e: - root_logger.warning('Unable to stop named service (%s)', e) + if sysupgrade.get_upgrade_state('dns', 'regular_named_masked'): + return False - try: - named.mask() - except Exception as e: - root_logger.warning('Unable to mask named service (%s)', e) + sysupgrade.set_upgrade_state('dns', 'regular_named_masked', True) - return True + if bindinstance.named_conf_exists(): + root_logger.info('[Masking named]') + named = services.service('named-regular') + try: + named.stop() + except Exception as e: + root_logger.warning('Unable to stop named service (%s)', e) + + try: + named.mask() + except Exception as e: + root_logger.warning('Unable to mask named service (%s)', e) - sysupgrade.set_upgrade_state('dns', 'regular_named_masked', True) + return True return False -- cgit