Depends on freeipa-dkupka-0028. https://fedorahosted.org/freeipa/ticket/4658 -- David Kupka
From 247ab543ed26c8eafa471b8b1d38309dacec9dbb Mon Sep 17 00:00:00 2001 From: David Kupka <dku...@redhat.com> Date: Thu, 6 Nov 2014 18:08:58 -0500 Subject: [PATCH] Remove service file even if it isn't link.
(Link to) service file from /etc/systemd/system/ must be removed before masking systemd service. https://fedorahosted.org/freeipa/ticket/4658 --- ipaplatform/base/services.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ipaplatform/base/services.py b/ipaplatform/base/services.py index 01d95b39cc7b845bdc612d40b3eea29d6de2961a..c3cd04bd61602bf3eccf5dd1276ff7371a90a768 100644 --- a/ipaplatform/base/services.py +++ b/ipaplatform/base/services.py @@ -443,11 +443,9 @@ class SystemdService(PlatformService): pass def mask(self, instance_name=""): - if instance_name != "": - srv_tgt = os.path.join(paths.ETC_SYSTEMD_SYSTEM_DIR, instance_name) - # remove instance file or link before masking - if os.path.islink(srv_tgt): - os.unlink(srv_tgt) + srv_tgt = os.path.join(paths.ETC_SYSTEMD_SYSTEM_DIR, self.service_instance(instance_name)) + if os.path.exists(srv_tgt): + os.unlink(srv_tgt) try: ipautil.run([paths.SYSTEMCTL, "mask", self.service_instance(instance_name)]) -- 2.1.0
_______________________________________________ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
