3 files changed, 1 insertions, 62 deletions
diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest
index 04e812bc..ed585cac 100644
--- a/sys-fs/zfs-utils/Manifest
+++ b/sys-fs/zfs-utils/Manifest
@@ -1 +1 @@
-DIST zfs-2.1.13.tar.gz 35170063 BLAKE2B 88f4b27a872071590294cf2a93d19633bacfaf1214fc4f06ab7ae7778376978754e0e2566d7bfe659d84426f525ecd05679b98310ddfc2d5938804c36fd03904 SHA512 d06fce8faa22b0cab2c69befa3842476703433fa90530d1fdf168716afd2039e97b124aa8ef581bed3bc19604fa2faa0bc1e29f6d028e3ef0085f0e34e05230a
+DIST zfs-2.2.1.tar.gz 33814243 BLAKE2B c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6 SHA512 05e17046ac4f0ba923151be3e554e075db4783c8936c5dcee2d3b6d459fb386ba33f9eb38d15c185db58a1d26926147a66c3b3fe14e9de40987f0e95efa2bb31
diff --git a/sys-fs/zfs-utils/files/2.1.5-r2-dracut-non-root.patch b/sys-fs/zfs-utils/files/2.1.5-r2-dracut-non-root.patch
deleted file mode 100644
index a9c6130f..00000000
--- a/sys-fs/zfs-utils/files/2.1.5-r2-dracut-non-root.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://github.com/openzfs/zfs/commit/eefe83eaa68f7cb4a49c580dd940d3688e42c849
-https://bugs.gentoo.org/854333
-
-From eefe83eaa68f7cb4a49c580dd940d3688e42c849 Mon Sep 17 00:00:00 2001
-From: Toyam Cox <aviator45003@gmail.com>
-Date: Thu, 30 Jun 2022 13:47:58 -0400
-Subject: [PATCH] dracut: fix boot on non-zfs-root systems
-
-Simply prevent overwriting root until it needs to be overwritten.
-
-Dracut could change this value before this module is called, but won't
-change the kernel command line.
-
-Reviewed-by: Andrew J. Hesford <ajh@sideband.org>
-Signed-off-by: Toyam Cox <vaelatern@voidlinux.org>
-Closes #13592
----
- contrib/dracut/90zfs/zfs-lib.sh.in | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/contrib/dracut/90zfs/zfs-lib.sh.in b/contrib/dracut/90zfs/zfs-lib.sh.in
-index e44673c2d75..3a43e514d6f 100755
---- a/contrib/dracut/90zfs/zfs-lib.sh.in
-+++ b/contrib/dracut/90zfs/zfs-lib.sh.in
-@@ -88,11 +88,11 @@ decode_root_args() {
-         return
-     fi
- 
--    root=$(getarg root=)
-+    xroot=$(getarg root=)
-     rootfstype=$(getarg rootfstype=)
- 
-     # shellcheck disable=SC2249
--    case "$root" in
-+    case "$xroot" in
-         ""|zfs|zfs:|zfs:AUTO)
-             root=zfs:AUTO
-             rootfstype=zfs
-@@ -100,7 +100,7 @@ decode_root_args() {
-             ;;
- 
-         ZFS=*|zfs:*)
--            root="${root#zfs:}"
-+            root="${xroot#zfs:}"
-             root="${root#ZFS=}"
-             root=$(echo "$root" | tr '+' ' ')
-             rootfstype=zfs
-@@ -109,9 +109,9 @@ decode_root_args() {
-     esac
- 
-     if [ "$rootfstype" = "zfs" ]; then
--        case "$root" in
-+        case "$xroot" in
-             "") root=zfs:AUTO ;;
--            *)  root=$(echo "$root" | tr '+' ' ') ;;
-+            *)  root=$(echo "$xroot" | tr '+' ' ') ;;
-         esac
-         return 0
-     fi
-
diff --git a/sys-fs/zfs-utils/zfs-utils-2.1.13.ebuild b/sys-fs/zfs-utils/zfs-utils-2.2.1.ebuild
index 5919c1b7..0545a209 100644
--- a/sys-fs/zfs-utils/zfs-utils-2.1.13.ebuild
+++ b/sys-fs/zfs-utils/zfs-utils-2.2.1.ebuild
@@ -50,7 +50,6 @@ RDEPEND="${DEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/2.1.5-r2-dracut-non-root.patch
 	"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
 )