From 1ec4799a4455f77c27e4446b0da9e939d54c5640 Mon Sep 17 00:00:00 2001 From: Zach Dykstra Date: Mon, 23 Jan 2023 15:30:52 -0600 Subject: [PATCH] zfs: update to 2.1.8. --- ...3-dracut-fix-typo-in-mount-zfs.sh.in.patch | 36 ------------------- srcpkgs/zfs/template | 4 +-- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 srcpkgs/zfs/patches/0003-dracut-fix-typo-in-mount-zfs.sh.in.patch diff --git a/srcpkgs/zfs/patches/0003-dracut-fix-typo-in-mount-zfs.sh.in.patch b/srcpkgs/zfs/patches/0003-dracut-fix-typo-in-mount-zfs.sh.in.patch deleted file mode 100644 index 9944a9a3b8a4..000000000000 --- a/srcpkgs/zfs/patches/0003-dracut-fix-typo-in-mount-zfs.sh.in.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 07f2793e869196fcbcd5057d9ada377674262fe3 Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf -Date: Wed, 29 Jun 2022 15:33:38 -0700 -Subject: [PATCH] dracut: fix typo in mount-zfs.sh.in -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Format the `zpool get` command correctly. The -o option must -be followed by "all" or the requested field name. - -Reviewed-by: Ahelenia Ziemiańska -Reviewed-by: George Melikov -Signed-off-by: Brian Behlendorf -Closes #13602 -Signed-off-by: Alexis Ehret ---- - contrib/dracut/90zfs/mount-zfs.sh.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/contrib/dracut/90zfs/mount-zfs.sh.in b/contrib/dracut/90zfs/mount-zfs.sh.in -index fa9f1bb76..b0eb614a6 100755 ---- a/contrib/dracut/90zfs/mount-zfs.sh.in -+++ b/contrib/dracut/90zfs/mount-zfs.sh.in -@@ -82,7 +82,7 @@ ZFS_DATASET="${ZFS_DATASET:-${root}}" - ZFS_POOL="${ZFS_DATASET%%/*}" - - --if ! zpool get -Ho name "${ZFS_POOL}" > /dev/null 2>&1; then -+if ! zpool get -Ho value name "${ZFS_POOL}" > /dev/null 2>&1; then - info "ZFS: Importing pool ${ZFS_POOL}..." - # shellcheck disable=SC2086 - if ! zpool import -N ${ZPOOL_IMPORT_OPTS} "${ZFS_POOL}"; then --- -2.37.3 - diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template index 910cf795319b..8557423f40be 100644 --- a/srcpkgs/zfs/template +++ b/srcpkgs/zfs/template @@ -1,6 +1,6 @@ # Template file for 'zfs' pkgname=zfs -version=2.1.7 +version=2.1.8 revision=1 build_style=gnu-configure configure_args="--with-config=user --with-mounthelperdir=/usr/bin @@ -16,7 +16,7 @@ maintainer="Toyam Cox " license="CDDL-1.0" homepage="https://openzfs.github.io/openzfs-docs/" distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz" -checksum=6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b +checksum=c81c6cdcc6c1deb24dda02e33389e9242f338ef8892e0c161945db1db8b48937 # dkms must be before initramfs-regenerate to build modules before images triggers="dkms initramfs-regenerate" dkms_modules="zfs ${version}"