summaryrefslogtreecommitdiffstats
path: root/rpm
diff options
context:
space:
mode:
authorNeal Gompa (ニール・ゴンパ) <[email protected]>2016-11-02 13:56:36 -0400
committerBrian Behlendorf <[email protected]>2016-11-02 10:56:36 -0700
commitb3c159fee4ab92832e6a735431b8b5f930665fab (patch)
treedf10dabde2aa4a4ee490381b6a16f5ccabea2848 /rpm
parent51c9163f98f60f585906a2ddec376924ad142f78 (diff)
Process all systemd services through the systemd scriptlets
This patch ensures that all systemd services are processed through the systemd scriptlets, so that services are properly configured per the preset file installed by the package. Without this, zfs.target is set, but none of the services are enabled per the preset file, meaning automounting filesystems and such won't work out of the box. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Neal Gompa <[email protected]> Closes #5356
Diffstat (limited to 'rpm')
-rw-r--r--rpm/generic/zfs.spec.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
index e80f51e31..6703c768b 100644
--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
@@ -39,6 +39,7 @@
# 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
@@ -239,7 +240,7 @@ find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \;
%post
%if 0%{?_systemd}
-%systemd_post zfs.target
+%systemd_post %{systemd_svcs}
%else
if [ -x /sbin/chkconfig ]; then
/sbin/chkconfig --add zfs-import
@@ -252,7 +253,7 @@ exit 0
%preun
%if 0%{?_systemd}
-%systemd_preun zfs.target
+%systemd_preun %{systemd_svcs}
%else
if [ $1 -eq 0 ] && [ -x /sbin/chkconfig ]; then
/sbin/chkconfig --del zfs-import
@@ -265,7 +266,7 @@ exit 0
%postun
%if 0%{?_systemd}
-%systemd_postun zfs.target
+%systemd_postun %{systemd_svcs}
%endif
%files