]> granicus.if.org Git - zfs/commitdiff
Fix undefined %{systemd_svcs} in RPM scriptlets
authorLOLi <loli10K@users.noreply.github.com>
Wed, 8 Nov 2017 17:16:37 +0000 (18:16 +0100)
committerTony Hutter <hutter2@llnl.gov>
Mon, 20 Nov 2017 22:48:26 +0000 (16:48 -0600)
This allows RPM-based systems to properly control package installation
and removal when using systemd.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #6838
Closes #6841

rpm/generic/zfs.spec.in

index f61cfd289060c40e8ae469ef71db59a38088743e..d09930881d46ca9db688aa938f96263950d1e310 100644 (file)
@@ -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
@@ -219,6 +218,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