Merge branch 'zfs_stable' into zfs_git

3 files changed, 7 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 76aef4c70e9f..8465a74551d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Sun Aug 13 17:22:42 UTC 2017
+# Sat Aug 19 19:50:07 UTC 2017
 pkgbase = zfs-dkms-git
-	pkgver = 0.7.0_r25_g376994828
+	pkgver = 0.7.0_r33_g08de8c16f
 	pkgrel = 1
 	url = http://zfsonlinux.org/
 	arch = i686
@@ -16,12 +16,12 @@ pkgbase = zfs-dkms-git
 	sha256sums = SKIP
 	sha256sums = b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540
 	sha256sums = aa5706bf08b36209a318762680f3c9fb45b3fc4b8e4ef184c8a5370b2c3000ca
-	sha256sums = 138964b43d7a282e1ed5f7fcf1f8dc9baa4f664655b628eeac1912a3017a787b
+	sha256sums = f95ad1a5421ccbb8b01f448373f46cfd1f718361a82c2687a597325cf9827e3e
 
 pkgname = zfs-dkms-git
 	pkgdesc = Kernel modules for the Zettabyte File System. (Git version)
 	depends = spl-dkms-git
-	depends = zfs-utils-dkms-git=0.7.0_r25_g376994828-1
+	depends = zfs-utils-dkms-git=0.7.0_r33_g08de8c16f-1
 	depends = dkms
 	provides = zfs
 	conflicts = zfs-git
diff --git a/PKGBUILD b/PKGBUILD
index 6e1d490ff08e..56b1c07787a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgbase="zfs-dkms-git"
 pkgname=("zfs-dkms-git" "zfs-utils-dkms-git")
-pkgver=0.7.0_r25_g376994828
+pkgver=0.7.0_r33_g08de8c16f
 pkgrel=1
 license=('CDDL')
 makedepends=("git" "spl-dkms-git")
@@ -17,7 +17,7 @@ source=("git+https://github.com/zfsonlinux/zfs.git"
 sha256sums=('SKIP'
             'b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540'
             'aa5706bf08b36209a318762680f3c9fb45b3fc4b8e4ef184c8a5370b2c3000ca'
-            '138964b43d7a282e1ed5f7fcf1f8dc9baa4f664655b628eeac1912a3017a787b')
+            'f95ad1a5421ccbb8b01f448373f46cfd1f718361a82c2687a597325cf9827e3e')
 
 pkgver() {
     cd "${srcdir}/zfs"
diff --git a/zfs.initcpio.hook b/zfs.initcpio.hook
index 222a7e18411b..7288ab8018b3 100644
--- a/zfs.initcpio.hook
+++ b/zfs.initcpio.hook
@@ -39,7 +39,7 @@ zfs_mount_handler () {
     local pool="${ZFS_DATASET%%/*}"
     local rwopt_exp="${rwopt:-ro}"
 
-    if ! zpool list -H "${pool}" 2&>1 > /dev/null ; then
+    if ! zpool list -H "${pool}" 2>&1 > /dev/null ; then
         if [ ! "${rwopt_exp}" = "rw" ]; then
             msg "ZFS: Importing pool ${pool} readonly."
             ZPOOL_IMPORT_FLAGS="${ZPOOL_IMPORT_FLAGS} -o readonly=on"