From: Nicop06 <Nicop06@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] dracut: add missing is_keysource parameter to cryptroot-ask
Date: Mon, 28 Feb 2022 19:50:02 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35892@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 612 bytes --]
There is a new pull request by Nicop06 against master on the void-packages repository
https://github.com/Nicop06/void-packages dracut
https://github.com/void-linux/void-packages/pull/35892
dracut: add missing is_keysource parameter to cryptroot-ask
Without this change, rd.luks.key.tout is used, which is the number of
times cryptroot tries to find the key.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64`)
A patch file from https://github.com/void-linux/void-packages/pull/35892.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dracut-35892.patch --]
[-- Type: text/x-diff, Size: 1975 bytes --]
From 302886448bf76c0f8c2152ad60762cfb09560440 Mon Sep 17 00:00:00 2001
From: Nicolas Porcel <nicolasporcel06@gmail.com>
Date: Mon, 28 Feb 2022 18:41:22 +0000
Subject: [PATCH] dracut: add missing is_keysource parameter to cryptroot-ask
Without this change, rd.luks.key.tout is used, which is the number of
times cryptroot tries to find the key.
---
.../dracut/patches/not_keysource_by_default.patch | 13 +++++++++++++
srcpkgs/dracut/template | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/dracut/patches/not_keysource_by_default.patch
diff --git a/srcpkgs/dracut/patches/not_keysource_by_default.patch b/srcpkgs/dracut/patches/not_keysource_by_default.patch
new file mode 100644
index 000000000000..f0d8a060dee9
--- /dev/null
+++ b/srcpkgs/dracut/patches/not_keysource_by_default.patch
@@ -0,0 +1,13 @@
+diff --git a/modules.d/90crypt/parse-crypt.sh b/modules.d/90crypt/parse-crypt.sh
+index 4e899fed..60faab43 100755
+--- a/modules.d/90crypt/parse-crypt.sh
++++ b/modules.d/90crypt/parse-crypt.sh
+@@ -177,7 +177,7 @@ else
+ {
+ printf -- 'ENV{ID_FS_TYPE}=="crypto_LUKS", RUN+="%s ' "$(command -v initqueue)"
+ printf -- '--unique --settled --onetime --name cryptroot-ask-%%k '
+- printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID} %s"\n' "$(command -v cryptroot-ask)" "$tout"
++ printf -- '%s $env{DEVNAME} luks-$env{ID_FS_UUID} 0 %s"\n' "$(command -v cryptroot-ask)" "$tout"
+ } >> /etc/udev/rules.d/70-luks.rules.new
+ else
+ {
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index d3b6c6616722..22ffa7a82c4e 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
version=053
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
next reply other threads:[~2022-02-28 18:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-28 18:50 Nicop06 [this message]
2022-06-26 2:17 ` github-actions
2022-07-11 2:13 ` [PR PATCH] [Closed]: " github-actions
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-35892@inbox.vuxu.org \
--to=nicop06@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).