From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1439000-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id A1FCC158094
for <garchives@archives.gentoo.org>; Fri, 23 Sep 2022 20:15:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9C1AEE0A8B;
Fri, 23 Sep 2022 20:15:53 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 81439E0A8B
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Sep 2022 20:15:53 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A09B834072E
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Sep 2022 20:15:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 419CD75
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Sep 2022 20:15:51 +0000 (UTC)
From: "Georgy Yakovlev" <gyakovlev@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" <gyakovlev@gentoo.org>
Message-ID: <1663964136.09a38ed7d7243ffebcb5ce419ec06e7991da96df.gyakovlev@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-fs/zfs/files/2.1.5-dracut-non-root.patch
X-VCS-Directories: sys-fs/zfs/files/
X-VCS-Committer: gyakovlev
X-VCS-Committer-Name: Georgy Yakovlev
X-VCS-Revision: 09a38ed7d7243ffebcb5ce419ec06e7991da96df
X-VCS-Branch: master
Date: Fri, 23 Sep 2022 20:15:51 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b5964d38-784a-4251-9775-bbb0d86b749d
X-Archives-Hash: d708d88606e7144159ca5b018b7de71e
commit: 09a38ed7d7243ffebcb5ce419ec06e7991da96df
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Sep 19 06:54:38 2022 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 20:15:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a38ed7
sys-fs/zfs: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.35 / pkgdev 0.2.1 / pkgcheck 0.10.14
Closes: https://github.com/gentoo/gentoo/pull/27350
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
sys-fs/zfs/files/2.1.5-dracut-non-root.patch | 33 ----------------------------
1 file changed, 33 deletions(-)
diff --git a/sys-fs/zfs/files/2.1.5-dracut-non-root.patch b/sys-fs/zfs/files/2.1.5-dracut-non-root.patch
deleted file mode 100644
index 6d1caf92cd2d..000000000000
--- a/sys-fs/zfs/files/2.1.5-dracut-non-root.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/openzfs/zfs/pull/13589
-https://bugs.gentoo.org/854333
-
-From ef9d996669cc2ec596d4e90753b89b32a3f0ce59 Mon Sep 17 00:00:00 2001
-From: "Andrew J. Hesford" <ajh@sideband.org>
-Date: Fri, 24 Jun 2022 11:05:53 -0400
-Subject: [PATCH] Dracut module: fix parsing of root= kernel command-line
- argument
-
-Some Dracut modules may read the `root=` kernel command-line argument
-and rewrite it; in particular, `rootfs-block` installs a command-line
-hook that to canonicalize arguments that specify block devices. If the
-`zfs` module is added to an initramfs (which it is, by default, as long
-as the core ZFS utilities are available) on a system that does not use a
-ZFS root filesystem, the `zfs` module will overwrite the `root` shell
-variable with the contents of the kernel command-line in the process of
-determining if it should control mounting the root. This breaks the
-initramfs. To solve this problem, only parse the kernel command-line
-directly if the `root` shell variable is empty; otherwise, rely on the
-parsing (and possible rewriting) done by other modules.
-
-Signed-off-by: Andrew J. Hesford <ajh@sideband.org>
---- a/contrib/dracut/90zfs/zfs-lib.sh.in
-+++ b/contrib/dracut/90zfs/zfs-lib.sh.in
-@@ -88,7 +88,7 @@ decode_root_args() {
- return
- fi
-
-- root=$(getarg root=)
-+ [ -n "$root" ] || root=$(getarg root=)
- rootfstype=$(getarg rootfstype=)
-
- # shellcheck disable=SC2249