From 011ef12c7a8d10da64d477d44a361de08e2d42e9 Mon Sep 17 00:00:00 2001 From: LOLi Date: Wed, 8 Nov 2017 18:16:37 +0100 Subject: 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 Reviewed-by: George Melikov Reviewed-by: Giuseppe Di Natale Signed-off-by: loli10K Closes #6838 Closes #6841 --- rpm/generic/zfs.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rpm/generic/zfs.spec.in') 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 -- cgit v1.2.3