Github messages for voidlinux
 help / color / mirror / Atom feed
From: 08A <08A@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] zfs: downstream patch (dracut fix typo in mount-zfs.sh)
Date: Sat, 10 Sep 2022 16:26:48 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39208@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1367 bytes --]

There is a new pull request by 08A against master on the void-packages repository

https://github.com/08A/void-packages downstream-zfs-patch
https://github.com/void-linux/void-packages/pull/39208

zfs: downstream patch (dracut fix typo in mount-zfs.sh)
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x84_64-glibc)

#####

Without this patch the dracut module can failed to mount the root partition.

PS: I am not the author of the patch. I extract it from the official zfs repo (`git format-patch -1 07f2793e869196fcbcd5057d9ada377674262fe3`)


A patch file from https://github.com/void-linux/void-packages/pull/39208.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-downstream-zfs-patch-39208.patch --]
[-- Type: text/x-diff, Size: 2560 bytes --]

From d97bc1e7b1f56048fcb5336adc5abb09d645d4c3 Mon Sep 17 00:00:00 2001
From: Alexis Ehret <git@08a.re>
Date: Sat, 10 Sep 2022 16:09:28 +0200
Subject: [PATCH] zfs: downstream patch (dracut fix typo in mount-zfs.sh)

---
 ...3-dracut-fix-typo-in-mount-zfs.sh.in.patch | 36 +++++++++++++++++++
 srcpkgs/zfs/template                          |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create 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
new file mode 100644
index 000000000000..9944a9a3b8a4
--- /dev/null
+++ b/srcpkgs/zfs/patches/0003-dracut-fix-typo-in-mount-zfs.sh.in.patch
@@ -0,0 +1,36 @@
+From 07f2793e869196fcbcd5057d9ada377674262fe3 Mon Sep 17 00:00:00 2001
+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
+Signed-off-by: Alexis Ehret <git@08a.re>
+---
+ 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 27bd02a64be0..226c46c25fe6 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.1.5
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d

             reply	other threads:[~2022-09-10 14:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-10 14:26 08A [this message]
2022-09-12 13:30 ` [PR PATCH] [Merged]: " sgn
2022-09-12 13:30 ` sgn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39208@inbox.vuxu.org \
    --to=08a@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).