diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-11 01:28:44 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-11 01:28:44 +0100 |
| commit | b46b9834b3fbf80b22ccc12e95f660512cd0fa75 (patch) | |
| tree | f7eb18ccc89e078e2f175e5249fe0d4dfdb5b104 /sys-fs/zfs/files/2.1.5-dracut-mount.patch | |
| parent | 62f7102650b24618880e8e6f08fcb8fbd235025b (diff) | |
gentoo auto-resync : 11:07:2022 - 01:28:44
Diffstat (limited to 'sys-fs/zfs/files/2.1.5-dracut-mount.patch')
| -rw-r--r-- | sys-fs/zfs/files/2.1.5-dracut-mount.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/sys-fs/zfs/files/2.1.5-dracut-mount.patch b/sys-fs/zfs/files/2.1.5-dracut-mount.patch new file mode 100644 index 000000000000..758f4b3a3e99 --- /dev/null +++ b/sys-fs/zfs/files/2.1.5-dracut-mount.patch @@ -0,0 +1,29 @@ +https://github.com/openzfs/zfs/commit/07f2793e869196fcbcd5057d9ada377674262fe3 +https://bugs.gentoo.org/857228 + +From: Brian Behlendorf <behlendorf1@llnl.gov> +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 <nabijaczleweli@nabijaczleweli.xyz> +Reviewed-by: George Melikov <mail@gmelikov.ru> +Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> +Closes #13602 +--- 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 + |