Skip to content

Commit

Permalink
Fix undefined %{systemd_svcs} in RPM scriptlets
Browse files Browse the repository at this point in the history
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
  • Loading branch information
loli10K authored and behlendorf committed Nov 8, 2017
1 parent d8fdfc2 commit 011ef12
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion rpm/generic/zfs.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 011ef12

Please sign in to comment.