summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-11-15 01:14:34 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-11-16 00:38:37 +0100
commit873e413323dfff4023604849c70944674ae5cd29 (patch)
treeea68a20f01598a8e62d18467e46e092842504bfa /Makefile.am
parentMerge pull request #1835 from poettering/grabbag-of-stuff (diff)
downloadsystemd-873e413323dfff4023604849c70944674ae5cd29.tar.xz
systemd-873e413323dfff4023604849c70944674ae5cd29.zip
Move daemon-reload from package %post scripts to file triggers
This uses new functionality added in rpm 4.13. Instead of doing one daemon-reload per packages, we do just one or two (When both installing and uninstalling packages, we do two. Unfortunately this also includes the common case of upgrades. When only installing or when only installing, we do just one.) New file triggers.systemd can be built, but the contents have to be copied into the rpm spec file by hand. Using %{load} does not seem to work. It can serve as documentation.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index cec07fac27..de8b556683 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1403,7 +1403,8 @@ nodist_rpmmacros_DATA = \
EXTRA_DIST += \
src/core/systemd.pc.in \
- src/core/macros.systemd.in
+ src/core/macros.systemd.in \
+ src/core/triggers.systemd.in
# ------------------------------------------------------------------------------
@@ -5873,7 +5874,7 @@ sysctl.d/%: sysctl.d/%.in
%.conf: %.conf.in
$(SED_PROCESS)
-src/core/macros.%: src/core/macros.%.in
+src/core/%.systemd: src/core/%.systemd.in
$(SED_PROCESS)
src/%.policy.in: src/%.policy.in.in