Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: engine-service: remove /usr/bin symlink ......................................................................
packaging: engine-service: remove /usr/bin symlink The engine-service script is not a utility to be used by user but by downstream packager, hence no reason to install at /usr/bin. Change-Id: I49fc25ad586b8f04e1588d04ab772858f2bfd169 Signed-off-by: Alon Bar-Lev <[email protected]> --- M Makefile M packaging/fedora/engine-service.systemd.in M packaging/fedora/engine-service.sysv.in M packaging/fedora/spec/ovirt-engine.spec.in 4 files changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/13626/1 diff --git a/Makefile b/Makefile index 4e17afa..4a8ac16 100644 --- a/Makefile +++ b/Makefile @@ -418,6 +418,3 @@ install -m 644 packaging/fedora/engine-service.xml.in $(DESTDIR)$(DATA_DIR)/service install -m 644 packaging/fedora/engine-service-logging.properties.in $(DESTDIR)$(DATA_DIR)/service install -m 755 packaging/fedora/engine-service.py $(DESTDIR)$(DATA_DIR)/service - - # Install the links: - ln -sf $(DATA_DIR)/service/engine-service.py $(DESTDIR)$(BIN_DIR)/engine-service diff --git a/packaging/fedora/engine-service.systemd.in b/packaging/fedora/engine-service.systemd.in index fa96f58..929e2e0 100644 --- a/packaging/fedora/engine-service.systemd.in +++ b/packaging/fedora/engine-service.systemd.in @@ -7,7 +7,7 @@ User=@ENGINE_USER@ Group=@ENGINE_GROUP@ LimitNOFILE=65535 -ExecStart=/usr/bin/engine-service start +ExecStart=/usr/share/ovirt-engine/service/engine-service.py start [Install] WantedBy=multi-user.target diff --git a/packaging/fedora/engine-service.sysv.in b/packaging/fedora/engine-service.sysv.in index 8a3f63a..b64a414 100644 --- a/packaging/fedora/engine-service.sysv.in +++ b/packaging/fedora/engine-service.sysv.in @@ -34,7 +34,7 @@ touch "${PIDFILE}" chown "${USER}" "${PIDFILE}" daemon --user "${USER}" --pidfile="${PIDFILE}" \ - /usr/bin/engine-service --pidfile="${PIDFILE}" --background start + /usr/share/ovirt-engine/service/engine-service.py --pidfile="${PIDFILE}" --background start RETVAL=$? echo if [ $RETVAL -eq 0 ]; then diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index 4159c2f..8f29823 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -435,7 +435,6 @@ # Files needed by the service: %{engine_data}/service -%{_bindir}/engine-service %if %{install_systemd} %{_unitdir}/%{engine_name}.service %endif -- To view, visit http://gerrit.ovirt.org/13626 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49fc25ad586b8f04e1588d04ab772858f2bfd169 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
