Semi-automated update for 0.7.2

4 files changed, 40 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6d4ae93b0c46..62bb8ff440d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Aug 14 00:29:19 UTC 2017
+# Tue Sep 26 17:28:42 UTC 2017
 pkgbase = zfs-utils-common
 	pkgdesc = Kernel module support files for the Zettabyte File System.
-	pkgver = 0.7.1
-	pkgrel = 2
+	pkgver = 0.7.2
+	pkgrel = 1
 	url = http://zfsonlinux.org/
 	install = zfs-utils.install
 	arch = x86_64
@@ -17,14 +17,14 @@ pkgbase = zfs-utils-common
 	conflicts = zfs-utils-linux-lts-git
 	replaces = zfs-utils-linux,
 	replaces = zfs-utils-linux-lts
-	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.1/zfs-0.7.1.tar.gz
+	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.2/zfs-0.7.2.tar.gz
 	source = zfs-utils.bash-completion-r1
 	source = zfs-utils.initcpio.install
 	source = zfs-utils.initcpio.hook
-	sha256sums = 231b104979ddacfeb1889e1dec175337276e7b3b109d40656089744b5caf3ef6
+	sha256sums = f75f4d8bbb8241e3d06321b53914e53fa22d1ccc8be89819b578b46e5d3e5cf4
 	sha256sums = b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540
-	sha256sums = aa5706bf08b36209a318762680f3c9fb45b3fc4b8e4ef184c8a5370b2c3000ca
-	sha256sums = 2bb533db561992c861bb9acad64a127f81cf0e4bf39cb4308ac7a73a17db55a7
+	sha256sums = e33adabbe3f2f4866802c9d63c7810c7a42b4df2288d0cdd23376519b15b36e4
+	sha256sums = b5f87d1d1d10443d8919125a4c139d5f4c579ca4433b2905ee826bb01defa56a
 
 pkgname = zfs-utils-common
 
diff --git a/PKGBUILD b/PKGBUILD
index abf3fda17e26..ee430b62d595 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,21 +6,22 @@
 #
 #
 pkgname="zfs-utils-common"
-pkgver=0.7.1
-pkgrel=2
+
+pkgver=0.7.2
+pkgrel=1
 pkgdesc="Kernel module support files for the Zettabyte File System."
 depends=("")
 makedepends=()
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.1/zfs-0.7.1.tar.gz"
+source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.2/zfs-0.7.2.tar.gz"
         "zfs-utils.bash-completion-r1"
         "zfs-utils.initcpio.install"
         "zfs-utils.initcpio.hook")
-sha256sums=("231b104979ddacfeb1889e1dec175337276e7b3b109d40656089744b5caf3ef6"
+sha256sums=("f75f4d8bbb8241e3d06321b53914e53fa22d1ccc8be89819b578b46e5d3e5cf4"
             "b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540"
-            "aa5706bf08b36209a318762680f3c9fb45b3fc4b8e4ef184c8a5370b2c3000ca"
-            "2bb533db561992c861bb9acad64a127f81cf0e4bf39cb4308ac7a73a17db55a7")
+            "e33adabbe3f2f4866802c9d63c7810c7a42b4df2288d0cdd23376519b15b36e4"
+            "b5f87d1d1d10443d8919125a4c139d5f4c579ca4433b2905ee826bb01defa56a")
 license=("CDDL")
 groups=("archzfs-linux")
 provides=("zfs-utils")
@@ -29,17 +30,17 @@ conflicts=('zfs-utils-common-git' 'zfs-utils-linux-git' 'zfs-utils-linux' 'zfs-u
 replaces=("zfs-utils-linux", "zfs-utils-linux-lts")
 
 build() {
-    cd "${srcdir}/zfs-0.7.1"
+    cd "${srcdir}/zfs-0.7.2"
     ./autogen.sh
     ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --with-mounthelperdir=/usr/bin \
                 --libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \
-                --with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs-0.7.1 \
+                --with-udevdir=/lib/udev --libexecdir=/usr/lib/zfs-0.7.2 \
                 --with-config=user
     make
 }
 
 package() {
-    cd "${srcdir}/zfs-0.7.1"
+    cd "${srcdir}/zfs-0.7.2"
     make DESTDIR="${pkgdir}" install
     # Remove uneeded files
     rm -r "${pkgdir}"/etc/init.d
diff --git a/zfs-utils.initcpio.hook b/zfs-utils.initcpio.hook
index 4337e23006ee..e6802bc356c8 100644
--- a/zfs-utils.initcpio.hook
+++ b/zfs-utils.initcpio.hook
@@ -25,6 +25,27 @@ zfs_get_bootfs () {
     return 1
 }
 
+zfs_decrypt_fs() {
+    dataset=$1
+
+    # check if 'zfs load-key' is available
+    zfs 2>&1 | grep load-key > /dev/null || return 0
+
+    # check if dataset is encrypted
+    [ "$(zfs get -H -o value encryption "${dataset}")" != "off" ] || return 0
+
+    # check if key is already loaded
+    [ "$(zfs get -H -o value keystatus "${dataset}")" != "available" ] || return 0
+    
+    # get the encryption root
+    encryptionroot=$(zfs get -H -o value encryptionroot "${dataset}")
+
+    # loop until we get the correct password
+    while ! eval zfs load-key "${encryptionroot}"; do
+        sleep 2
+    done
+}
+
 zfs_mount_handler () {
     if [ "${ZFS_DATASET}" = "bootfs" ] ; then
         if ! zfs_get_bootfs ; then
@@ -69,11 +90,13 @@ zfs_mount_handler () {
                     if findmnt -snero source -F "${tab_file}" -S "${dataset}" > /dev/null 2>&1; then
                         opt=$(findmnt -snero options -F "${tab_file}" -S "${dataset}")
                         mnt=$(findmnt -snero target -F "${tab_file}" -S "${dataset}")
+                        zfs_decrypt_fs "${dataset}"
                         mount -t zfs -o "${opt}" "${dataset}" "${node}${mnt}"
                     fi
                 fi
                 ;;
             *)
+                zfs_decrypt_fs "${dataset}"
                 mount -t zfs -o "zfsutil,${rwopt_exp}" "${dataset}" "${node}/${mountpoint##${rootmnt}}"
                 ;;
         esac
diff --git a/zfs-utils.initcpio.install b/zfs-utils.initcpio.install
index 3ab0f5266e60..6f7d05b5addc 100644
--- a/zfs-utils.initcpio.install
+++ b/zfs-utils.initcpio.install
@@ -7,7 +7,6 @@ build() {
         zunicode \
         zcommon \
         zfs \
-        zpios \
         spl \
         splat
 
@@ -22,7 +21,6 @@ build() {
         zfs \
         zhack \
         zinject \
-        zpios \
         zpool \
         zstreamdump \
         ztest \