diff options
| author | Alexander Bokovoy <abokovoy@redhat.com> | 2012-02-01 17:51:24 +0200 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-02-08 20:11:56 -0500 |
| commit | bcad48974ae08131d00be69dec3e7aa1969b6924 (patch) | |
| tree | 6c83401e5c19ebfdfee61dd28212374cc27c8ba6 /ipapython/platform/systemd.py | |
| parent | 9078efeb4034dac3dd6f27741d6c3adb43d526a5 (diff) | |
| download | freeipa.git-bcad48974ae08131d00be69dec3e7aa1969b6924.tar.gz freeipa.git-bcad48974ae08131d00be69dec3e7aa1969b6924.tar.xz freeipa.git-bcad48974ae08131d00be69dec3e7aa1969b6924.zip | |
Handle upgrade issues with systemd in Fedora 16 and above
Since 389-ds-base-1.2.10-0.8.a7 Directory Server's systemd settings are
configured via /etc/sysconfig/dirsrv.systemd. It means logic change in
systemd/fedora16 platform of FreeIPA.
Additionally, existing installs need to be handled during upgrade.
Fixes:
https://fedorahosted.org/freeipa/ticket/2117
https://fedorahosted.org/freeipa/ticket/2300
Diffstat (limited to 'ipapython/platform/systemd.py')
| -rw-r--r-- | ipapython/platform/systemd.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/ipapython/platform/systemd.py b/ipapython/platform/systemd.py index 3f1fe730..ae06c022 100644 --- a/ipapython/platform/systemd.py +++ b/ipapython/platform/systemd.py @@ -137,16 +137,12 @@ class SystemdService(base.PlatformService): if len(instance_name) > 0 and l > 1: # New instance, we need to do following: - # 1. Copy <service>@.service to /etc/systemd/system/ if it is not there - # 2. Make /etc/systemd/system/<service>.target.wants/ if it is not there - # 3. Link /etc/systemd/system/<service>.target.wants/<service>@<instance_name>.service to - # /etc/systemd/system/<service>@.service - srv_etc = os.path.join(self.SYSTEMD_ETC_PATH, self.service_name) + # 1. Make /etc/systemd/system/<service>.target.wants/ if it is not there + # 2. Link /etc/systemd/system/<service>.target.wants/<service>@<instance_name>.service to + # /lib/systemd/system/<service>@.service srv_tgt = os.path.join(self.SYSTEMD_ETC_PATH, self.SYSTEMD_SRV_TARGET % (elements[0])) srv_lnk = os.path.join(srv_tgt, self.service_instance(instance_name)) try: - if not ipautil.file_exists(srv_etc): - shutil.copy(self.lib_path, srv_etc) if not ipautil.dir_exists(srv_tgt): os.mkdir(srv_tgt) if os.path.exists(srv_lnk): @@ -156,11 +152,11 @@ class SystemdService(base.PlatformService): # object does not exist _or_ is a broken link if not os.path.islink(srv_lnk): # if it truly does not exist, make a link - os.symlink(srv_etc, srv_lnk) + os.symlink(self.lib_path, srv_lnk) else: # Link exists and it is broken, make new one os.unlink(srv_lnk) - os.symlink(srv_etc, srv_lnk) + os.symlink(self.lib_path, srv_lnk) ipautil.run(["/bin/systemctl", "--system", "daemon-reload"]) except: pass @@ -172,7 +168,7 @@ class SystemdService(base.PlatformService): if instance_name != "" and len(elements) > 1: # Remove instance, we need to do following: # Remove link from /etc/systemd/system/<service>.target.wants/<service>@<instance_name>.service - # to /etc/systemd/system/<service>@.service + # to /lib/systemd/system/<service>@.service srv_tgt = os.path.join(self.SYSTEMD_ETC_PATH, self.SYSTEMD_SRV_TARGET % (elements[0])) srv_lnk = os.path.join(srv_tgt, self.service_instance(instance_name)) try: |