Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: engine-service: rename service directory to services ......................................................................
packaging: engine-service: rename service directory to services we are about to have more than single service Change-Id: I918264883c69f3429a45ccb854c8f23c4f1d55e7 Signed-off-by: Alon Bar-Lev <alo...@redhat.com> --- M Makefile M packaging/fedora/spec/ovirt-engine.spec.in M packaging/services/engine-service.systemd.in M packaging/services/engine-service.sysv.in 4 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/14152/1 diff --git a/Makefile b/Makefile index 63ff09c..0c52ed1 100644 --- a/Makefile +++ b/Makefile @@ -416,6 +416,6 @@ # Install the files: install -dm 755 $(DESTDIR)$(DATA_DIR)/services - install -m 644 packaging/services/engine-service.xml.in $(DESTDIR)$(DATA_DIR)/service - install -m 644 packaging/services/engine-service-logging.properties.in $(DESTDIR)$(DATA_DIR)/service - install -m 755 packaging/services/engine-service.py $(DESTDIR)$(DATA_DIR)/service + install -m 644 packaging/services/engine-service.xml.in $(DESTDIR)$(DATA_DIR)/services + install -m 644 packaging/services/engine-service-logging.properties.in $(DESTDIR)$(DATA_DIR)/services + install -m 755 packaging/services/engine-service.py $(DESTDIR)$(DATA_DIR)/services diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index 5d4686d..0dcd8ec 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -487,7 +487,7 @@ %dir %{engine_data}/ui-plugins # Files needed by the service: -%{engine_data}/service +%{engine_data}/services %if %{install_systemd} %{_unitdir}/%{engine_name}.service %endif diff --git a/packaging/services/engine-service.systemd.in b/packaging/services/engine-service.systemd.in index d966813..bbee6ff 100644 --- a/packaging/services/engine-service.systemd.in +++ b/packaging/services/engine-service.systemd.in @@ -7,7 +7,7 @@ User=@ENGINE_USER@ Group=@ENGINE_GROUP@ LimitNOFILE=65535 -ExecStart=/usr/share/ovirt-engine/service/engine-service.py $OVIRT_ENGINE_EXTRA_ARGS start +ExecStart=/usr/share/ovirt-engine/services/engine-service.py $OVIRT_ENGINE_EXTRA_ARGS start EnvironmentFile=-/etc/sysconfig/ovirt-engine [Install] diff --git a/packaging/services/engine-service.sysv.in b/packaging/services/engine-service.sysv.in index 07b54bb..c52c7b8 100644 --- a/packaging/services/engine-service.sysv.in +++ b/packaging/services/engine-service.sysv.in @@ -34,7 +34,7 @@ touch "${PIDFILE}" chown "${USER}" "${PIDFILE}" daemon --user "${USER}" --pidfile="${PIDFILE}" \ - /usr/share/ovirt-engine/service/engine-service.py \ + /usr/share/ovirt-engine/services/engine-service.py \ --pidfile="${PIDFILE}" \ --background \ ${OVIRT_ENGINE_EXTRA_ARGS} \ -- To view, visit http://gerrit.ovirt.org/14152 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I918264883c69f3429a45ccb854c8f23c4f1d55e7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches