Imported Upstream version 0.6.5.3

[mirror_zfs-debian.git] / rpm / generic / zfs.spec.in

diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
index b7833afbb2d45fabd013aec7cb506e5c0663f82b..20b59088ec580dbf9db6e18a0a89cc6fc580049b 100644 (file)
--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
@@ -28,6 +28,11 @@
 %endif
 %endif
 
+# Set the default _initconfdir when undefined.
+%if %{undefined _initconfdir}
+%global _initconfdir /etc/sysconfig
+%endif
+
 %bcond_with    debug
 %bcond_with    blkid
 %bcond_with    systemd
@@ -189,6 +194,19 @@ Requires:       dracut
 This package contains a dracut module used to construct an initramfs
 image which is ZFS aware.
 
+%if 0%{?_initramfs}
+%package initramfs
+Summary:        Initramfs module
+Group:          System Environment/Kernel
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
+Requires:       initramfs-tools
+
+%description initramfs
+This package contains a initramfs module used to construct an initramfs
+image which is ZFS aware.
+%endif
+
 %prep
 %if %{with debug}
     %define debug --enable-debug
@@ -229,7 +247,12 @@ find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \;
 %if 0%{?_systemd}
 %systemd_post zfs.target
 %else
-[ -x /sbin/chkconfig ] && /sbin/chkconfig --add zfs
+if [ -x /sbin/chkconfig ]; then
+    /sbin/chkconfig --add zfs-import
+    /sbin/chkconfig --add zfs-mount
+    /sbin/chkconfig --add zfs-share
+    /sbin/chkconfig --add zfs-zed
+fi
 %endif
 exit 0
 
@@ -237,8 +260,11 @@ exit 0
 %if 0%{?_systemd}
 %systemd_preun zfs.target
 %else
-if [ $1 -eq 0 ] ; then
-    [ -x /sbin/chkconfig ] && /sbin/chkconfig --del zfs
+if [ $1 -eq 0 ] && [ -x /sbin/chkconfig ]; then
+    /sbin/chkconfig --del zfs-import
+    /sbin/chkconfig --del zfs-mount
+    /sbin/chkconfig --del zfs-share
+    /sbin/chkconfig --del zfs-zed
 fi
 %endif
 exit 0
@@ -258,14 +284,15 @@ exit 0
 %{_udevdir}/vdev_id
 %{_udevdir}/zvol_id
 %{_udevdir}/rules.d/*
-%config(noreplace) %{_sysconfdir}/%{name}
 %if 0%{?_systemd}
 /usr/lib/modules-load.d/*
 %{_unitdir}/*
 %{_presetdir}/*
 %else
-%{_sysconfdir}/init.d/*
+%config(noreplace) %{_sysconfdir}/init.d/*
+%config(noreplace) %{_initconfdir}/zfs
 %endif
+%config(noreplace) %{_sysconfdir}/%{name}
 
 %files -n libzpool2
 %{_libdir}/libzpool.so.*
@@ -291,24 +318,44 @@ exit 0
 %{_datadir}/%{name}
 
 %files dracut
-%doc dracut/README.dracut.markdown
+%doc contrib/dracut/README.dracut.markdown
 %{_dracutdir}/modules.d/*
 
+%if 0%{?_initramfs}
+%files initramfs
+%doc contrib/initramfs/README.initramfs.markdown
+/usr/share/initramfs-tools/*
+%else
+# Since we're not building the initramfs package,
+# ignore those files.
+%exclude /usr/share/initramfs-tools
+%endif
+
 %changelog
-* Wed Jun 24 2015 Ned Bass <bass6@llnl.gov> - 0.6.4.2-1
-- Fix panic due to corrupt nvlist when running utilities zfsonlinux/zfs#3335
-- Fix hard lockup due to infinite loop in zfs_zget() zfsonlinux/zfs#3349
-- Fix panic on unmount due to iput taskq zfsonlinux/zfs#3281
-- Improve metadata shrinker performance on pre-3.1 kernels zfsonlinux/zfs#3501
-- Linux 4.1 compat: use read_iter() / write_iter()
-- Linux 3.12 compat: NUMA-aware per-superblock shrinker
-- Fix spurious hung task watchdog stack traces zfsonlinux/zfs#3402
-- Fix module loading in zfs import systemd service zfsonlinux/zfs#3440
-- Fix intermittent libzfs_init() failure to open /dev/zfs zfsonlinux/zfs#2556
-* Thu Apr 23 2015 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.4.1-1
-- Fix direct memory reclaim deadlocks zfsonlinux/zfs#3331 zfsonlinux/zfs#3225
-- Fix hot-disk sparing for disk vdevs zfsonlinux/zfs#3310
-- Fix system spinning during ARC reclaim zfsonlinux/zfs#3283
+* Tue Oct 13 2015 Ned Bass <bass6@llnl.gov> - 0.6.5.3-1
+- Don't import all visible pools in zfs-import init script zfsonlinux/zfs#3777
+- Fix use-after-free in vdev_disk_physio_completion zfsonlinux/zfs#3920
+- Fix avl_is_empty(&dn->dn_dbufs) assertion zfsonlinux/zfs#3865
+* Wed Sep 30 2015 Ned Bass <bass6@llnl.gov> - 0.6.5.2-1
+- Init script fixes zfsonlinux/zfs#3816
+- Fix uioskip crash when skip to end zfsonlinux/zfs#3806 zfsonlinux/zfs#3850
+- Userspace can trigger an assertion zfsonlinux/zfs#3792
+- Fix quota userused underflow bug zfsonlinux/zfs#3789
+- Fix performance regression from unwanted synchronous I/O zfsonlinux/zfs#3780
+- Fix deadlock during ARC reclaim zfsonlinux/zfs#3808 zfsonlinux/zfs#3834
+- Fix deadlock with zfs receive and clamscan zfsonlinux/zfs#3719
+- Allow NFS activity to defer snapshot unmounts zfsonlinux/zfs#3794
+- Linux 4.3 compatibility zfsonlinux/zfs#3799
+- Zed reload fixes zfsonlinux/zfs#3773
+- Fix PAX Patch/Grsec SLAB_USERCOPY panic zfsonlinux/zfs#3796
+- Always remove during dkms uninstall/update zfsonlinux/spl#476
+* Sat Sep 19 2015 Ned Bass <bass6@llnl.gov> - 0.6.5.1-1
+- Fix zvol corruption with TRIM/discard zfsonlinux/zfs#3798
+- Fix NULL as mount(2) syscall data parameter zfsonlinux/zfs#3804
+- Fix xattr=sa dataset property not honored zfsonlinux/zfs#3787
+* Fri Sep 11 2015 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.5-1
+- Released 0.6.5-1, detailed release notes are available at:
+- https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5
 * Wed Apr  8 2015 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.4-1
 - Released 0.6.4-1
 * Thu Jun 12 2014 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.3-1