Mark Wu has uploaded a new change for review.

Change subject: spec: fix that vdsmd.service is not enabled after installation
......................................................................

spec: fix that vdsmd.service is not enabled after installation

For fedora18+, we use the helper macro to replace the manual systemd
scriptlets. But for post installation, %systemd_post is expanded as
below:
        /usr/bin/systemctl preset vdsmd.service >/dev/null 2>&1 || :
So vdsm service will be disabled after installation because the default
systemd preset setting disable all services which are not explictly
enabled in the configuration files.

We can ship a preset configuration file to enable vdsmd service, but
reverting to manual systemd scriptlets is simpler and doesn't lose any
benefit.

Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Signed-off-by: Mark Wu <[email protected]>
---
M vdsm.spec.in
1 file changed, 0 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/54/16754/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index 560e01a..7ab96ea 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -634,11 +634,6 @@
     /sbin/chkconfig --add vdsm-restore-net-config
 fi
 %else
-%if 0%{?with_systemd_macros}
-%systemd_post vdsmd.service
-%systemd_post supervdsmd.service
-%systemd_post vdsm-restore-net-config.service
-%else
 if [ "$1" -eq 1 ] ; then
     /bin/systemctl enable vdsmd.service >/dev/null 2>&1 || :
     /bin/systemctl enable supervdsmd.service >/dev/null 2>&1 || :
@@ -646,7 +641,6 @@
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 exit 0
-%endif
 %endif
 
 %preun


-- 
To view, visit http://gerrit.ovirt.org/16754
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ba726296d510c1281bc9425e9f420b911ec45f7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Mark Wu <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Reply via email to