Merge branch 'zfs_stable_wip' into zfs_git_wip

3 files changed, 7 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f1e6c97a87e..8409a37c038a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Tue Sep 20 20:47:10 UTC 2016
+# Sun Feb 12 22:36:09 UTC 2017
 pkgbase = zfs-dkms-git
-	pkgver = 0.7.0_rc1_r26_gd2a6f65
+	pkgver = 0.7.0_rc3_r89_g717afc132
 	pkgrel = 1
 	url = http://zfsonlinux.org/
 	arch = i686
@@ -16,12 +16,12 @@ pkgbase = zfs-dkms-git
 	sha256sums = SKIP
 	sha256sums = b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540
 	sha256sums = 17114052aa20c528f022f7f1349971aa28810e2ed2c97871226b5679a91f7e77
-	sha256sums = 90d50df503464e8d76770488dbd491cb633ee27984d4d3a31b03f1a4e7492038
+	sha256sums = 138964b43d7a282e1ed5f7fcf1f8dc9baa4f664655b628eeac1912a3017a787b
 
 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_rc1_r26_gd2a6f65-1
+	depends = zfs-utils-dkms-git=0.7.0_rc3_r89_g717afc132-1
 	depends = dkms
 	provides = zfs
 	conflicts = zfs-git
diff --git a/PKGBUILD b/PKGBUILD
index e417647dde82..1b37c3e0ec0c 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_rc1_r26_gd2a6f65
+pkgver=0.7.0_rc3_r89_g717afc132
 pkgrel=1
 license=('CDDL')
 makedepends=("git" "spl-dkms-git")
@@ -17,7 +17,7 @@ source=("git+https://github.com/zfsonlinux/zfs.git"
 sha256sums=('SKIP'
             'b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540'
             '17114052aa20c528f022f7f1349971aa28810e2ed2c97871226b5679a91f7e77'
-            '90d50df503464e8d76770488dbd491cb633ee27984d4d3a31b03f1a4e7492038')
+            '138964b43d7a282e1ed5f7fcf1f8dc9baa4f664655b628eeac1912a3017a787b')
 
 pkgver() {
     cd "${srcdir}/zfs"
diff --git a/zfs.initcpio.hook b/zfs.initcpio.hook
index 09d081f04b69..222a7e18411b 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"