gentoo auto-resync : 23:09:2022 - 23:30:45

3 files changed, 0 insertions, 34 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 1d5c785c4d42..d618de64dba8 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 631e8752b255..b60aab7b62ed 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,5 +1,4 @@
 AUX 2.1.5-dracut-mount.patch 1093 BLAKE2B b22c3195332a6be3656282a16a5a10622effe64b5b4d852285a9d1fb4d59be852421b401c5ff9753a3a9febf6066c7120851199d04e837193a9f794b2304722f SHA512 e482880bc714c60da8758140c4560592de6eabd5a010febccc8bb8f81388ed009d944149c7b463006c67116d240c67d69d58fcaaa6b2f1984cbc64230f7de33d
-AUX 2.1.5-dracut-non-root.patch 1418 BLAKE2B ed5e530c05b586ae73bacf274448574b72bd48aa395ad03c6ce943979ab880cae221feaaa975329979124a21a2159fc60d92dbced0bcadc678a600dc84a6461b SHA512 ce5834d12ba746e0063df3f23f17b5e7a15e5b84d840fa870a9bd02ae8fdef2a9e2d18dbbac4a3de299d2bddf379ae062338c7fb5acaa2101e55bfcbfa2dc261
 AUX 2.1.5-dracut-zfs-bootfs-snapshot-fixes.patch 4362 BLAKE2B 678b99fee828753318dbf59ac478b0c1d71843c040d56d598027578403f69935d271c3dc78ce82540acffee7bd282a055622440ef40410af08f07630b899ef50 SHA512 4a3e4942ac64dea6fe6bd37da9683880ff4cc7b69d797976669dfe7fe48e0603264b033f8ee83ed794a249b127d407b3320bb7249c903016769be6441f10110b
 AUX 2.1.5-dracut-zfs-missing.patch 309 BLAKE2B e66e700757aa6498b71d714c13e29e671455c77b1b319c7e951b10edc7179f37149b093c5b24fa17b487b9025112bcf31dffb441bbdde7943d90d16443140384 SHA512 0de374270a4814a937e5d97ec4261c5f77ef44fb8f3afc74c4b802d140e4595362b288ff91b8a5c4e9754871969d1f6af05eafa9c91e38c8b913c26ba78b1676
 AUX 2.1.5-r2-dracut-non-root.patch 1823 BLAKE2B b6954c1648742cb19b1cea5709bdba78477731232bfd6a180f2b2aa179ba2e10ac968af6658fc9fd9a7a03127098c7e4401f3ad803e603d4e114d995b370da3d SHA512 33b3244de91f3d51ef2c2eff2ea4515890b7fa9b39a077b4034f770772077e75e6c5db187c76aa19dd2fb60dac91de35d70fbd84be3704bb950bbf8d4656c29a
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