aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLOLi <[email protected]>2017-11-08 18:16:37 +0100
committerBrian Behlendorf <[email protected]>2017-11-08 09:16:37 -0800
commit011ef12c7a8d10da64d477d44a361de08e2d42e9 (patch)
tree6c42e2f9544268162b68450260840f4c2a36ef95
parentd8fdfc2d657b2926cf8d7ceb9675ff0df7265858 (diff)
Fix undefined %{systemd_svcs} in RPM scriptlets
This allows RPM-based systems to properly control package installation and removal when using systemd. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: George Melikov <[email protected]> Reviewed-by: Giuseppe Di Natale <[email protected]> Signed-off-by: loli10K <[email protected]> Closes #6838 Closes #6841
-rw-r--r--rpm/generic/zfs.spec.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
index 14f2929c6..697f5d3a1 100644
--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
@@ -39,7 +39,6 @@
# Generic enable switch for systemd
%if %{with systemd}
%define _systemd 1
-%define systemd_svcs zfs-import-cache.service zfs-import-scan.service zfs-mount.service zfs-share.service zfs-zed.service zfs.target
%endif
# RHEL >= 7 comes with systemd
@@ -222,6 +221,7 @@ image which is ZFS aware.
%endif
%if 0%{?_systemd}
%define systemd --enable-systemd --with-systemdunitdir=%{_unitdir} --with-systemdpresetdir=%{_presetdir} --disable-sysvinit
+ %define systemd_svcs zfs-import-cache.service zfs-import-scan.service zfs-mount.service zfs-share.service zfs-zed.service zfs.target
%else
%define systemd --enable-sysvinit --disable-systemd
%endif