[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. debian/0.6.5.7-1-6-g356f442

[Aron Xu]

The following commit has been merged in the master branch:
commit 356f442876f905d8481525ec745ed22763e048b7
Author: Aron Xu <aron at debian.org>
Date:   Thu Aug 4 21:54:39 2016 +0800

    Add busybox to depdency of zfs-initramfs (Closes: #824976)

diff --git a/debian/control b/debian/control
index 15f1648..ee0a96a 100644
--- a/debian/control
+++ b/debian/control
@@ -101,7 +101,10 @@ Description: OpenZFS filesystem kernel modules for Linux
 
 Package: zfs-initramfs
 Architecture: all
-Depends: initramfs-tools, zfs-modules | zfs-dkms, zfsutils-linux, ${misc:Depends}
+Depends: initramfs-tools,
+ busybox-initramfs | busybox-static | busybox,
+ zfs-modules | zfs-dkms, zfsutils-linux,
+ ${misc:Depends}
 Description: OpenZFS 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
diff --git a/debian/control.in b/debian/control.in
index 15f1648..ee0a96a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -101,7 +101,10 @@ Description: OpenZFS filesystem kernel modules for Linux
 
 Package: zfs-initramfs
 Architecture: all
-Depends: initramfs-tools, zfs-modules | zfs-dkms, zfsutils-linux, ${misc:Depends}
+Depends: initramfs-tools,
+ busybox-initramfs | busybox-static | busybox,
+ zfs-modules | zfs-dkms, zfsutils-linux,
+ ${misc:Depends}
 Description: OpenZFS 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

-- 
OpenZFS on Linux