|
 |
7f93bc2 |
From 0a818dbae3218dd1beb80f287bb3ef47c583b150 Mon Sep 17 00:00:00 2001
|
|
|
a59965a |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
a59965a |
Date: Fri, 13 Jun 2014 19:05:22 +0200
|
|
|
a59965a |
Subject: [PATCH] rpm: don't hardcode the binary paths in the macros, rely on
|
|
|
a59965a |
$PATH
|
|
|
a59965a |
|
|
|
a59965a |
this gives us a little bit more freedom to move things around later on,
|
|
|
a59965a |
as we don't hardcode the systemd paths in old RPMs that shall work with
|
|
|
a59965a |
new systemds.
|
|
|
a59965a |
|
|
|
a59965a |
(cherry picked from commit 8cf7c96517c3688d29b30651adcda9e71e7fcb07)
|
|
|
a59965a |
(cherry picked from commit 2ea8cba266174f4c4afe7b0a5fbbfebf93fb37cc)
|
|
|
a59965a |
---
|
|
|
a59965a |
src/core/macros.systemd.in | 20 ++++++++++----------
|
|
|
a59965a |
1 file changed, 10 insertions(+), 10 deletions(-)
|
|
|
a59965a |
|
|
|
a59965a |
diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
|
|
|
a59965a |
index 89b4825..167016a 100644
|
|
|
a59965a |
--- a/src/core/macros.systemd.in
|
|
|
a59965a |
+++ b/src/core/macros.systemd.in
|
|
|
a59965a |
@@ -37,42 +37,42 @@ Requires(postun): systemd \
|
|
|
a59965a |
%systemd_post() \
|
|
|
a59965a |
if [ $1 -eq 1 ] ; then \
|
|
|
a59965a |
# Initial installation \
|
|
|
a59965a |
- @rootbindir@/systemctl preset %{?*} >/dev/null 2>&1 || : \
|
|
|
a59965a |
+ systemctl preset %{?*} >/dev/null 2>&1 || : \
|
|
|
a59965a |
fi \
|
|
|
a59965a |
%{nil}
|
|
|
a59965a |
|
|
|
a59965a |
%systemd_preun() \
|
|
|
a59965a |
if [ $1 -eq 0 ] ; then \
|
|
|
a59965a |
# Package removal, not upgrade \
|
|
|
a59965a |
- @rootbindir@/systemctl --no-reload disable %{?*} > /dev/null 2>&1 || : \
|
|
|
a59965a |
- @rootbindir@/systemctl stop %{?*} > /dev/null 2>&1 || : \
|
|
|
a59965a |
+ systemctl --no-reload disable %{?*} > /dev/null 2>&1 || : \
|
|
|
a59965a |
+ systemctl stop %{?*} > /dev/null 2>&1 || : \
|
|
|
a59965a |
fi \
|
|
|
a59965a |
%{nil}
|
|
|
a59965a |
|
|
|
a59965a |
%systemd_postun() \
|
|
|
a59965a |
-@rootbindir@/systemctl daemon-reload >/dev/null 2>&1 || : \
|
|
|
a59965a |
+systemctl daemon-reload >/dev/null 2>&1 || : \
|
|
|
a59965a |
%{nil}
|
|
|
a59965a |
|
|
|
a59965a |
%systemd_postun_with_restart() \
|
|
|
a59965a |
-@rootbindir@/systemctl daemon-reload >/dev/null 2>&1 || : \
|
|
|
a59965a |
+systemctl daemon-reload >/dev/null 2>&1 || : \
|
|
|
a59965a |
if [ $1 -ge 1 ] ; then \
|
|
|
a59965a |
# Package upgrade, not uninstall \
|
|
|
a59965a |
- @rootbindir@/systemctl try-restart %{?*} >/dev/null 2>&1 || : \
|
|
|
a59965a |
+ systemctl try-restart %{?*} >/dev/null 2>&1 || : \
|
|
|
a59965a |
fi \
|
|
|
a59965a |
%{nil}
|
|
|
a59965a |
|
|
|
a59965a |
%udev_hwdb_update() \
|
|
|
a59965a |
-@rootbindir@/udevadm hwdb --update >/dev/null 2>&1 || : \
|
|
|
a59965a |
+udevadm hwdb --update >/dev/null 2>&1 || : \
|
|
|
a59965a |
%{nil}
|
|
|
a59965a |
|
|
|
a59965a |
%udev_rules_update() \
|
|
|
a59965a |
-@rootbindir@/udevadm control --reload >/dev/null 2>&1 || : \
|
|
|
a59965a |
+udevadm control --reload >/dev/null 2>&1 || : \
|
|
|
a59965a |
%{nil}
|
|
|
a59965a |
|
|
|
a59965a |
%journal_catalog_update() \
|
|
|
a59965a |
-@rootbindir@/journalctl --update-catalog >/dev/null 2>&1 || : \
|
|
|
a59965a |
+journalctl --update-catalog >/dev/null 2>&1 || : \
|
|
|
a59965a |
%{nil}
|
|
|
a59965a |
|
|
|
a59965a |
%tmpfiles_create() \
|
|
|
a59965a |
-@rootbindir@/systemd-tmpfiles --create %{?*} >/dev/null 2>&1 || : \
|
|
|
a59965a |
+systemd-tmpfiles --create %{?*} >/dev/null 2>&1 || : \
|
|
|
a59965a |
%{nil}
|