summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2020-11-01 21:19:40 +0000
committerArchzfs Buildbot2020-11-01 21:19:40 +0000
commitccabcc59e34395f96b1fe209fff762dc56234e6f (patch)
tree2e0b254a326d6a5fb87644f4cfc934a958e56ea9
parent2775f1b1be3324065801809cd5d693d37cb02aba (diff)
downloadaur-ccabcc59e34395f96b1fe209fff762dc56234e6f.tar.gz
Semi-automated update for zfs 2.0.0-rc4
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--zfs-utils.initcpio.hook2
3 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e161bb837950..ae85b04b5fa0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = zfs-utils-rc
pkgdesc = Kernel module support files for the Zettabyte File System.
pkgver = 2.0.0_rc4
- pkgrel = 1
+ pkgrel = 2
url = http://zfsonlinux.org/
install = zfs-utils.install
arch = x86_64
@@ -26,7 +26,7 @@ pkgbase = zfs-utils-rc
source = zfs-utils.initcpio.zfsencryptssh.install
sha256sums = d89838d93b4429de98075de1a7fcac4b22673cedab4e9b109594f9f8c2456c51
sha256sums = 29a8a6d76fff01b71ef1990526785405d9c9410bdea417b08b56107210d00b10
- sha256sums = 446a4793cbb8ebf5196ef5ed60c372096c161c48bf714eb053f619791a7042f9
+ sha256sums = 2dc521d46a126946abed335ff6a3a790b61d1213e97869f23e5aa7a0944ad222
sha256sums = 29080a84e5d7e36e63c4412b98646043724621245b36e5288f5fed6914da5b68
pkgname = zfs-utils-rc
diff --git a/PKGBUILD b/PKGBUILD
index 1b405aed988d..da91024c2801 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
pkgname="zfs-utils-rc"
pkgver=2.0.0_rc4
-pkgrel=1
+pkgrel=2
pkgdesc="Kernel module support files for the Zettabyte File System."
makedepends=("python" "python-setuptools" "python-cffi")
optdepends=("python: pyzfs and extra utilities", "python-cffi: pyzfs")
@@ -20,7 +20,7 @@ source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver/_/-}/z
"zfs-utils.initcpio.zfsencryptssh.install")
sha256sums=("d89838d93b4429de98075de1a7fcac4b22673cedab4e9b109594f9f8c2456c51"
"29a8a6d76fff01b71ef1990526785405d9c9410bdea417b08b56107210d00b10"
- "446a4793cbb8ebf5196ef5ed60c372096c161c48bf714eb053f619791a7042f9"
+ "2dc521d46a126946abed335ff6a3a790b61d1213e97869f23e5aa7a0944ad222"
"29080a84e5d7e36e63c4412b98646043724621245b36e5288f5fed6914da5b68")
license=("CDDL")
groups=("archzfs-linux-rc")
diff --git a/zfs-utils.initcpio.hook b/zfs-utils.initcpio.hook
index 5aca30fc033b..d596bb1394eb 100644
--- a/zfs-utils.initcpio.hook
+++ b/zfs-utils.initcpio.hook
@@ -94,7 +94,7 @@ zfs_mount_handler () {
mountpoint=$(zfs get -H -o value mountpoint "${dataset}")
canmount=$(zfs get -H -o value canmount "${dataset}")
# skip dataset
- [ ${canmount} = "off" -o ${mountpoint} = "none" ] && continue
+ [ ${canmount} = "off" -o ${canmount} = "noauto" -o ${mountpoint} = "none" ] && continue
if [ ${mountpoint} = "legacy" ]; then
if [ -f "${tab_file}" ]; then
if findmnt -snero source -F "${tab_file}" -S "${dataset}" > /dev/null 2>&1; then