Semi-automated update for 4.4.21_1-2

4 files changed, 29 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 452e7e71483a..95c72c602abf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Sep 17 06:13:45 UTC 2016
+# Sat Sep 17 07:41:44 UTC 2016
 pkgbase = zfs-utils-linux-lts
 	pkgdesc = Kernel module support files for the Zettabyte File System.
 	pkgver = 0.6.5.8_4.4.21_1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://zfsonlinux.org/
 	install = zfs-utils.install
 	arch = x86_64
@@ -21,8 +21,8 @@ pkgbase = zfs-utils-linux-lts
 	source = zfs-utils.initcpio.hook
 	sha256sums = d77f43f7dc38381773e2c34531954c52f3de80361b7bb10c933a7482f89cfe84
 	sha256sums = b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540
-	sha256sums = dfafce18240722bee26b5864982b4db1cd6d682c4b93a8b1f4832c98686f50d2
-	sha256sums = 5f749dbe3b853c5b569d5050b50226b53961cf1fa2cfc5cea0ecc3df75885d2f
+	sha256sums = 17114052aa20c528f022f7f1349971aa28810e2ed2c97871226b5679a91f7e77
+	sha256sums = 90d50df503464e8d76770488dbd491cb633ee27984d4d3a31b03f1a4e7492038
 
 pkgname = zfs-utils-linux-lts
 
diff --git a/PKGBUILD b/PKGBUILD
index 4201c20b1b0d..0afdb19b52b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@
 #
 pkgname="zfs-utils-linux-lts"
 pkgver=0.6.5.8_4.4.21_1
-pkgrel=1
+pkgrel=2
 pkgdesc="Kernel module support files for the Zettabyte File System."
 depends=("spl-linux-lts" "linux-lts=4.4.21")
 makedepends=("linux-lts-headers=4.4.21")
@@ -29,8 +29,8 @@ source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.8/zfs-0.6
         "zfs-utils.initcpio.hook")
 sha256sums=("d77f43f7dc38381773e2c34531954c52f3de80361b7bb10c933a7482f89cfe84"
             "b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540"
-            "dfafce18240722bee26b5864982b4db1cd6d682c4b93a8b1f4832c98686f50d2"
-            "5f749dbe3b853c5b569d5050b50226b53961cf1fa2cfc5cea0ecc3df75885d2f")
+            "17114052aa20c528f022f7f1349971aa28810e2ed2c97871226b5679a91f7e77"
+            "90d50df503464e8d76770488dbd491cb633ee27984d4d3a31b03f1a4e7492038")
 license=("CDDL")
 groups=("archzfs-linux-lts")
 provides=("zfs-utils")
diff --git a/zfs-utils.initcpio.hook b/zfs-utils.initcpio.hook
index 8f1d587b01ab..09d081f04b69 100644
--- a/zfs-utils.initcpio.hook
+++ b/zfs-utils.initcpio.hook
@@ -1,3 +1,9 @@
+#
+# WARNING: This script is parsed by ash in busybox at boot time, not bash!
+# http://linux.die.net/man/1/ash
+# https://wiki.ubuntu.com/DashAsBinSh
+# http://www.jpsdomain.org/public/2008-JP_bash_vs_dash.pdf
+#
 ZPOOL_FORCE=""
 ZPOOL_IMPORT_FLAGS=""
 
@@ -31,24 +37,24 @@ zfs_mount_handler () {
     fi
 
     local pool="${ZFS_DATASET%%/*}"
-    local rwopt_exp=${rwopt:-ro}
+    local rwopt_exp="${rwopt:-ro}"
 
-    if ! zpool list -H ${pool} 2>1 > /dev/null ; then
-        if [ "${rwopt_exp}" != "rw" ]; 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"
         else
             msg "ZFS: Importing pool ${pool}."
         fi
 
-        if ! zpool import ${ZPOOL_IMPORT_FLAGS} -N ${pool} ${ZPOOL_FORCE} ; then
+        if ! zpool import ${ZPOOL_IMPORT_FLAGS} -N "${pool}" ${ZPOOL_FORCE} ; then
             die "ZFS: Unable to import pool ${pool}."
         fi
     fi
 
-    local node=$1
-    local tab_file="$node/etc/fstab"
-    local zfs_datasets=$(zfs list -H -o name -t filesystem -r "${ZFS_DATASET}")
+    local node="$1"
+    local tab_file="${node}/etc/fstab"
+    local zfs_datasets="$(zfs list -H -o name -t filesystem -r ${ZFS_DATASET})"
 
     # Mount the root, and any child datasets
     for dataset in ${zfs_datasets}; do
@@ -75,35 +81,33 @@ zfs_mount_handler () {
 
 run_hook() {
     # Force import the pools, useful if the pool has not properly been exported using 'zpool export <pool>'
-    [[ ${zfs_force} == 1 ]] && ZPOOL_FORCE='-f'
+    [ ! "${zfs_force}" = "" ] && ZPOOL_FORCE="-f"
 
     # Add import directory to import command flags
-    [[ "${zfs_import_dir}" != "" ]] && ZPOOL_IMPORT_FLAGS="${ZPOOL_IMPORT_FLAGS} -d ${zfs_import_dir}"
+    [ ! "${zfs_import_dir}" = "" ] && ZPOOL_IMPORT_FLAGS="${ZPOOL_IMPORT_FLAGS} -d ${zfs_import_dir}"
 
     # Wait 15 seconds for ZFS devices to show up
-    [[ "${zfs_wait}" == "" ]] && ZFS_WAIT="15" || ZFS_WAIT="${zfs_wait}"
+    [ "${zfs_wait}" = "" ] && ZFS_WAIT="15" || ZFS_WAIT="${zfs_wait}"
 
-    if [[ "${root}" == 'zfs' ]]; then
-        mount_handler='zfs_mount_handler'
-    fi
+    [ "${root}" = "zfs" ] && mount_handler="zfs_mount_handler"
 
     case ${zfs} in
         "")
             # skip this line/dataset
             ;;
         auto|bootfs)
-            ZFS_DATASET='bootfs'
+            ZFS_DATASET="bootfs"
             mount_handler="zfs_mount_handler"
             ;;
         *)
-            ZFS_DATASET=${zfs}
+            ZFS_DATASET="${zfs}"
             mount_handler="zfs_mount_handler"
             ;;
     esac
 
     # Allow up to n seconds for zfs device to show up
-    for i in {1..${ZFS_WAIT}}; do
-        [[ -c "/dev/zfs" ]] && break
+    for i in $(seq 1 ${ZFS_WAIT}); do
+        [ -c "/dev/zfs" ] && break
         sleep 1
     done
 }
diff --git a/zfs-utils.initcpio.install b/zfs-utils.initcpio.install
index 3cfb836dba7d..19364a386a45 100644
--- a/zfs-utils.initcpio.install
+++ b/zfs-utils.initcpio.install
@@ -17,6 +17,7 @@ build() {
         dbufstat.py \
         fsck.zfs \
         mount.zfs \
+        seq \
         zdb \
         zed \
         zfs \