sync with archzfs/zfs-utils-git

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

4 files changed, 11 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 668cc8536439..01d30fe421aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = zfs-utils-git
 	pkgdesc = Userspace utilities for the Zettabyte File System.
-	pkgver = 2.1.99.r1271.g1c0c729ab4
+	pkgver = 2.1.99.r1389.g48cf170d5a
 	pkgrel = 1
 	epoch = 2
 	url = https://zfsonlinux.org/
@@ -13,19 +13,15 @@ pkgbase = zfs-utils-git
 	makedepends = git
 	optdepends = python: pyzfs and extra utilities,
 	optdepends = python-cffi: pyzfs
-	provides = zfs-utils=2.1.99.r1271.g1c0c729ab4
+	provides = zfs-utils=2.1.99.r1389.g48cf170d5a
 	conflicts = zfs-utils
-	source = git+https://github.com/zfsonlinux/zfs.git
+	source = git+https://github.com/openzfs/zfs.git
 	source = zfs.initcpio.install
 	source = zfs.initcpio.hook
 	source = zfs.initcpio.zfsencryptssh.install
-	sha256sums = SKIP
-	sha256sums = 600f49d610906476f492d53ee1830154e4ebedf999284485e07d9cb2b3084766
-	sha256sums = 8b8c9b6ebfddfb51f2ab70fb943f53f08f6140140561efcb106120941edbc36e
-	sha256sums = 93e6ac4e16f6b38b2fa397a63327bcf7001111e3a58eb5fb97c888098c932a51
 	b2sums = SKIP
-	b2sums = 5147f165bc53cb792aaf11724cef253601fe853cd7bc43aeff0ef5cd3a23dbde57e38710c941803d6b5f5838bde99271804608221f1c6b33f30b734edbd85913
-	b2sums = 32352e2e188073da4f61278899b6d343313ee3494d69dd10a38ab87bce2f2003767f0f49bc1c3c4d785dd1fc67eab4a27a6fdd5ffc5e63cf94d25f3dbffae4c1
+	b2sums = f7c78e5a0ce887e89e5cdc52515381d647a51586cb05c52a900e1307520f6f0fa828f8f5fd5a30823b233dcd79f0496375b21d044103e1d765e20f728c2d0fee
+	b2sums = 04892c161e9197d3d4d4cf5ae97d03e91b980426c033973cdcf76ff957e4ef0b2d541a7d184102ff267a29e5db772ac06616cacb3c4252f2fe5a18f0d81891f2
 	b2sums = 04e2af875e194df393d6cff983efc3fdf02a03a745d1b0b1e4a745f873d910b4dd0a45db956c1b5b2d97e9d5bf724ef12e23f7a2be3d5c12be027eaccf42349a
 
 pkgname = zfs-utils-git
diff --git a/PKGBUILD b/PKGBUILD
index a18cf467a49f..5493984a2654 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # PRs are welcome: https://github.com/yurikoles-aur/zfs-utils-git
 
 pkgname=zfs-utils-git
-pkgver=2.1.99.r1271.g1c0c729ab4
+pkgver=2.1.99.r1389.g48cf170d5a
 pkgrel=1
 epoch=2
 pkgdesc="Userspace utilities for the Zettabyte File System."
@@ -17,17 +17,13 @@ makedepends=('python' 'python-setuptools' 'python-cffi' 'git')
 optdepends=('python: pyzfs and extra utilities', 'python-cffi: pyzfs')
 provides=("${pkgname%-git}=${pkgver}")
 conflicts=("${pkgname%-git}")
-source=('git+https://github.com/zfsonlinux/zfs.git'
+source=('git+https://github.com/openzfs/zfs.git'
         'zfs.initcpio.install'
         'zfs.initcpio.hook'
         'zfs.initcpio.zfsencryptssh.install')
-sha256sums=('SKIP'
-            '600f49d610906476f492d53ee1830154e4ebedf999284485e07d9cb2b3084766'
-            '8b8c9b6ebfddfb51f2ab70fb943f53f08f6140140561efcb106120941edbc36e'
-            '93e6ac4e16f6b38b2fa397a63327bcf7001111e3a58eb5fb97c888098c932a51')
 b2sums=('SKIP'
-        '5147f165bc53cb792aaf11724cef253601fe853cd7bc43aeff0ef5cd3a23dbde57e38710c941803d6b5f5838bde99271804608221f1c6b33f30b734edbd85913'
-        '32352e2e188073da4f61278899b6d343313ee3494d69dd10a38ab87bce2f2003767f0f49bc1c3c4d785dd1fc67eab4a27a6fdd5ffc5e63cf94d25f3dbffae4c1'
+        'f7c78e5a0ce887e89e5cdc52515381d647a51586cb05c52a900e1307520f6f0fa828f8f5fd5a30823b233dcd79f0496375b21d044103e1d765e20f728c2d0fee'
+        '04892c161e9197d3d4d4cf5ae97d03e91b980426c033973cdcf76ff957e4ef0b2d541a7d184102ff267a29e5db772ac06616cacb3c4252f2fe5a18f0d81891f2'
         '04e2af875e194df393d6cff983efc3fdf02a03a745d1b0b1e4a745f873d910b4dd0a45db956c1b5b2d97e9d5bf724ef12e23f7a2be3d5c12be027eaccf42349a')
 
 pkgver() {
diff --git a/zfs.initcpio.hook b/zfs.initcpio.hook
index 7fecb13030c8..bcb6d40cab37 100644
--- a/zfs.initcpio.hook
+++ b/zfs.initcpio.hook
@@ -129,7 +129,7 @@ zfs_mount_handler () {
 
     local node="$1"
     local rootmnt=$(zfs get -H -o value mountpoint "${ZFS_DATASET}")
-    local tab_file="${node}/etc/fstab"
+    local tab_file="/etc/fstab"
     local zfs_datasets="$(zfs list -H -o name -t filesystem -r ${ZFS_DATASET})"
 
     # Mount the root, and any child datasets
diff --git a/zfs.initcpio.install b/zfs.initcpio.install
index d51183b19e89..fd3387f66d68 100644
--- a/zfs.initcpio.install
+++ b/zfs.initcpio.install
@@ -41,6 +41,7 @@ build() {
 
     [[ -f /etc/zfs/zpool.cache ]] && cp "/etc/zfs/zpool.cache" "${BUILDROOT}/etc/zfs/zpool.cache.org"
     [[ -f /etc/modprobe.d/zfs.conf ]] && add_file "/etc/modprobe.d/zfs.conf"
+    [[ -f /etc/fstab ]] && add_file "/etc/fstab"
 }
 
 help() {