diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | zfs-utils.initcpio.hook | 33 | ||||
| -rw-r--r-- | zfs-utils.initcpio.install | 3 |
4 files changed, 23 insertions, 29 deletions
@@ -1,6 +1,6 @@ pkgbase = zfs-utils-git pkgdesc = Kernel module support files for the Zettabyte File System. - pkgver = 2018.11.20.r4835.g8005ca4f7 + pkgver = 2018.11.26.r4836.g62ee31adc pkgrel = 1 url = http://zfsonlinux.org/ install = zfs-utils.install @@ -16,15 +16,15 @@ pkgbase = zfs-utils-git replaces = zfs-utils-common-git backup = etc/zfs/zed.d/zed.rc backup = etc/default/zfs - source = git+https://github.com/zfsonlinux/zfs.git#commit=8005ca4f749f71397197292452ca539a25286b89 + source = git+https://github.com/zfsonlinux/zfs.git#commit=62ee31adcebe64a1b7cdf1225356108a924c595a source = zfs-utils.bash-completion-r1 source = zfs-utils.initcpio.install source = zfs-utils.initcpio.hook source = zfs-utils.initcpio.zfsencryptssh.install sha256sums = SKIP sha256sums = b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540 - sha256sums = 6e5e905a322d0426acdcbc05c5651ec78ee7b874b96d3c429c80f68b061170c5 - sha256sums = ae1cda85de0ad8b9ec8158a66d02485f3d09c37fb13b1567367220a720bcc9a5 + sha256sums = 29a8a6d76fff01b71ef1990526785405d9c9410bdea417b08b56107210d00b10 + sha256sums = 78e038f95639c209576e7fa182afd56ac11a695af9ebfa958709839ff1e274ce sha256sums = 29080a84e5d7e36e63c4412b98646043724621245b36e5288f5fed6914da5b68 pkgname = zfs-utils-git @@ -6,9 +6,9 @@ # http://github.com/archzfs/archzfs # pkgname="zfs-utils-git" -_commit='8005ca4f749f71397197292452ca539a25286b89' +_commit='62ee31adcebe64a1b7cdf1225356108a924c595a' -pkgver=2018.11.20.r4835.g8005ca4f7 +pkgver=2018.11.26.r4836.g62ee31adc pkgrel=1 pkgdesc="Kernel module support files for the Zettabyte File System." makedepends=("git") @@ -21,8 +21,8 @@ source=("git+https://github.com/zfsonlinux/zfs.git#commit=${_commit}" "zfs-utils.initcpio.zfsencryptssh.install") sha256sums=("SKIP" "b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540" - "6e5e905a322d0426acdcbc05c5651ec78ee7b874b96d3c429c80f68b061170c5" - "ae1cda85de0ad8b9ec8158a66d02485f3d09c37fb13b1567367220a720bcc9a5" + "29a8a6d76fff01b71ef1990526785405d9c9410bdea417b08b56107210d00b10" + "78e038f95639c209576e7fa182afd56ac11a695af9ebfa958709839ff1e274ce" "29080a84e5d7e36e63c4412b98646043724621245b36e5288f5fed6914da5b68") license=("CDDL") groups=("archzfs-linux-git") diff --git a/zfs-utils.initcpio.hook b/zfs-utils.initcpio.hook index b47cc2849c9e..b75d2fa17961 100644 --- a/zfs-utils.initcpio.hook +++ b/zfs-utils.initcpio.hook @@ -91,25 +91,22 @@ zfs_mount_handler () { # Mount the root, and any child datasets for dataset in ${zfs_datasets}; do mountpoint=$(zfs get -H -o value mountpoint "${dataset}") - case ${mountpoint} in - "none") - # skip this line/dataset. - ;; - "legacy") - if [ -f "${tab_file}" ]; then - 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 + canmount=$(zfs get -H -o value canmount "${dataset}") + # skip dataset + [ ${canmount} = "off" -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 + 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 - ;; - *) - zfs_decrypt_fs "${dataset}" - mount -t zfs -o "zfsutil,${rwopt_exp}" "${dataset}" "${node}/${mountpoint##${rootmnt}}" - ;; - esac + fi + else + zfs_decrypt_fs "${dataset}" + mount -t zfs -o "zfsutil,${rwopt_exp}" "${dataset}" "${node}/${mountpoint##${rootmnt}}" + fi done } diff --git a/zfs-utils.initcpio.install b/zfs-utils.initcpio.install index 8b646a101a04..350377b0d58c 100644 --- a/zfs-utils.initcpio.install +++ b/zfs-utils.initcpio.install @@ -10,8 +10,6 @@ build() { spl map add_binary \ - arcstat.py \ - dbufstat.py \ fsck.zfs \ mount.zfs \ seq \ @@ -22,7 +20,6 @@ build() { zinject \ zpool \ zstreamdump \ - ztest \ /lib/udev/vdev_id \ /lib/udev/zvol_id \ findmnt |