- fix systemd junk install

- rel 5

diff --git a/am.patch b/am.patch
index 9fd774fa768842c5a8dc3d07cdaa1b99bace79b8..da7d8d187e5a33289509601f005d05ecb57b6560 100644 (file)
--- a/am.patch
+++ b/am.patch
@@ -30,3 +30,14 @@ index 55cae89fa..8ce1af3b8 100644
        cd $(DESTDIR)$(prefix)/src/zfs-$(VERSION)/$(LINUX_VERSION) && \
        ln -fs zfs_config.h spl_config.h && \
        ln -fs zfs.release spl.release
+--- zfs-0.7.9/config/user-systemd.m4~  2018-08-17 08:32:52.000000000 +0200
++++ zfs-0.7.9/config/user-systemd.m4   2018-08-19 12:08:45.390362052 +0200
+@@ -18,7 +18,7 @@
+       AC_ARG_WITH(systemdmodulesloaddir,
+               AC_HELP_STRING([--with-systemdmodulesloaddir=DIR],
+               [install systemd module load files into dir [[/usr/lib/modules-load.d]]]),
+-              systemdmoduleloaddir=$withval,systemdmodulesloaddir=/usr/lib/modules-load.d)
++              systemdmodulesloaddir=$withval,systemdmodulesloaddir=/usr/lib/modules-load.d)
+ 
+       AC_ARG_WITH(systemdgeneratordir,
+               AC_HELP_STRING([--with-systemdgeneratordir=DIR],

diff --git a/zfs.spec b/zfs.spec
index dcca76a21332461160f16cf754fcc4be59a07d83..c44c09dd1e2714a1e66e431c7808ca31e0af8a2d 100644 (file)
--- a/zfs.spec
+++ b/zfs.spec
@@ -27,7 +27,7 @@ exit 1
 
 %define                _duplicate_files_terminate_build        0
 
-%define        rel     4
+%define        rel     5
 %define        pname   zfs
 Summary:       Native Linux port of the ZFS filesystem
 Summary(pl.UTF-8):     Natywny linuksowy port systemu plików ZFS
@@ -258,6 +258,8 @@ p=`pwd`\
        --with-linux=%{_kernelsrcdir} \
        --with-systemdunitdir=%{systemdunitdir} \
        --with-systemdpresetdir=/etc/systemd/system-preset \
+       --with-systemdmodulesloaddir=/etc/modules-load.d \
+       --with-systemdgeneratordir=/lib/systemd/system-generators \
        --with-udevdir=/lib/udev
 
 %{__make} \
@@ -348,9 +350,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(754,root,root) /etc/rc.d/init.d/zfs-zed
 %config(noreplace) %verify(not md5 mtime size) /etc/default/zfs
 /etc/zfs/zfs-functions
-/usr/lib/modules-load.d/zfs.conf
+/etc/modules-load.d/zfs.conf
 /etc/systemd/system-preset/50-zfs.preset
-/usr/lib/systemd/system-generators/zfs-mount-generator
+/lib/systemd/system-generators/zfs-mount-generator
 %{systemdunitdir}/zfs.target
 %{systemdunitdir}/zfs-import.target
 %{systemdunitdir}/zfs-import-cache.service