diff options
| author | Archzfs Buildbot | 2020-11-02 08:24:41 +0000 |
|---|---|---|
| committer | Archzfs Buildbot | 2020-11-02 08:24:41 +0000 |
| commit | 8352bd3b250c00f1c0dcfb85019a09be584d3122 (patch) | |
| tree | 3ca4cb15ff778309cdd2f13c1be86a4ff64f03a5 | |
| parent | ccabcc59e34395f96b1fe209fff762dc56234e6f (diff) | |
| download | aur-8352bd3b250c00f1c0dcfb85019a09be584d3122.tar.gz | |
Semi-automated update for zfs 2.0.0-rc4
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | zfs-utils.initcpio.hook | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = zfs-utils-rc pkgdesc = Kernel module support files for the Zettabyte File System. pkgver = 2.0.0_rc4 - pkgrel = 2 + pkgrel = 3 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 = 2dc521d46a126946abed335ff6a3a790b61d1213e97869f23e5aa7a0944ad222 + sha256sums = 449a6db4abd3f166562bb67a63950af053e9ec07eabbfcdff827c5ed0113a2d6 sha256sums = 29080a84e5d7e36e63c4412b98646043724621245b36e5288f5fed6914da5b68 pkgname = zfs-utils-rc @@ -8,7 +8,7 @@ pkgname="zfs-utils-rc" pkgver=2.0.0_rc4 -pkgrel=2 +pkgrel=3 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" - "2dc521d46a126946abed335ff6a3a790b61d1213e97869f23e5aa7a0944ad222" + "449a6db4abd3f166562bb67a63950af053e9ec07eabbfcdff827c5ed0113a2d6" "29080a84e5d7e36e63c4412b98646043724621245b36e5288f5fed6914da5b68") license=("CDDL") groups=("archzfs-linux-rc") diff --git a/zfs-utils.initcpio.hook b/zfs-utils.initcpio.hook index d596bb1394eb..c3c62150aff1 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 ${canmount} = "noauto" -o ${mountpoint} = "none" ] && continue + [ ${dataset} != "${ZFS_DATASET}" -a \( ${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 |