[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.4.2-632-g937bf5a

[Aron Xu]

The following commit has been merged in the master branch:
commit 12c939467a98ab9ea93ab4be1b6ae0e9be90c8cc
Author: Aron Xu <aron at debian.org>
Date:   Sun Nov 1 22:36:12 2015 +0800

    Add package for dracut support

diff --git a/debian/control b/debian/control
index 2a5bd21..d4b368e 100644
--- a/debian/control
+++ b/debian/control
@@ -99,7 +99,7 @@ Description: Native ZFS filesystem kernel modules for Linux
 Package: zfs-initramfs
 Architecture: linux-any
 Depends: initramfs-tools, zfs-modules | zfs-dkms, zfsutils-linux, ${misc:Depends}
-Description: Native ZFS root filesystem capabilities for Linux
+Description: Native ZFS root filesystem capabilities for Linux - initramfs
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
  checksums.
@@ -107,12 +107,23 @@ Description: Native ZFS root filesystem capabilities for Linux
  This package adds ZFS to the system initramfs with a hook
  for the initramfs-tools infrastructure.
 
+Package: zfs-dracut
+Architecture: linux-any
+Depends: dracut, zfs-modules | zfs-dkms, zfsutils-linux, ${misc:Depends}
+Description: Native ZFS root filesystem capabilities for Linux - dracut
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ This package adds ZFS to the system initramfs with a hook
+ for the dracut infrastructure.
+
 Package: zfsutils-linux
 Section: contrib/admin
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: lsb-base, zfs-modules | zfs-dkms
-Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
+Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
 Conflicts: zfs, zfs-fuse
 Replaces: zfs
 Provides: zfsutils
diff --git a/debian/control.in b/debian/control.in
index 2a5bd21..d4b368e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -99,7 +99,7 @@ Description: Native ZFS filesystem kernel modules for Linux
 Package: zfs-initramfs
 Architecture: linux-any
 Depends: initramfs-tools, zfs-modules | zfs-dkms, zfsutils-linux, ${misc:Depends}
-Description: Native ZFS root filesystem capabilities for Linux
+Description: Native ZFS root filesystem capabilities for Linux - initramfs
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
  checksums.
@@ -107,12 +107,23 @@ Description: Native ZFS root filesystem capabilities for Linux
  This package adds ZFS to the system initramfs with a hook
  for the initramfs-tools infrastructure.
 
+Package: zfs-dracut
+Architecture: linux-any
+Depends: dracut, zfs-modules | zfs-dkms, zfsutils-linux, ${misc:Depends}
+Description: Native ZFS root filesystem capabilities for Linux - dracut
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ This package adds ZFS to the system initramfs with a hook
+ for the dracut infrastructure.
+
 Package: zfsutils-linux
 Section: contrib/admin
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: lsb-base, zfs-modules | zfs-dkms
-Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
+Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
 Conflicts: zfs, zfs-fuse
 Replaces: zfs
 Provides: zfsutils
diff --git a/debian/zfs-dracut.install b/debian/zfs-dracut.install
index 74de57c..d91c734 100644
--- a/debian/zfs-dracut.install
+++ b/debian/zfs-dracut.install
@@ -1 +1 @@
-usr/share/dracut
+usr/lib/dracut

-- 
ZFS on Linux