From: travankor <travankor@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] mkinitcpio: update encrypt and lvm2 hooks.
Date: Mon, 30 Aug 2021 04:33:09 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32750@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1656 bytes --]
There is a new pull request by travankor against master on the void-packages repository
https://github.com/travankor/void-packages mkinitcpio-lvm
https://github.com/void-linux/void-packages/pull/32750
mkinitcpio: update encrypt and lvm2 hooks.
Sync encrypt hook with upstream.
Remove workaround for lvm2 hook.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [X] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/32750.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mkinitcpio-lvm-32750.patch --]
[-- Type: text/x-diff, Size: 3506 bytes --]
From 0a65cc9b8c9d6cebab17dcaf6c9e646ef0dc778b Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Sun, 29 Aug 2021 19:31:22 -0700
Subject: [PATCH] mkinitcpio: update encrypt and lvm2 hooks.
Sync encrypt hook with upstream.
Remove workaround for lvm2 hook.
---
srcpkgs/mkinitcpio/files/encrypt_hook | 15 +++++++++++++--
srcpkgs/mkinitcpio/files/lvm2_hook | 13 -------------
srcpkgs/mkinitcpio/files/lvm2_install | 1 +
srcpkgs/mkinitcpio/template | 2 +-
4 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/mkinitcpio/files/encrypt_hook b/srcpkgs/mkinitcpio/files/encrypt_hook
index 882d5fb4423d..6bc1eea35920 100644
--- a/srcpkgs/mkinitcpio/files/encrypt_hook
+++ b/srcpkgs/mkinitcpio/files/encrypt_hook
@@ -55,16 +55,27 @@ EOF
echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead."
}
- for cryptopt in ${cryptoptions//,/ }; do
+ set -f
+ OLDIFS="$IFS"; IFS=,
+ for cryptopt in ${cryptoptions}; do
case ${cryptopt} in
- allow-discards)
+ allow-discards|discard)
cryptargs="${cryptargs} --allow-discards"
;;
+ no-read-workqueue|perf-no_read_workqueue)
+ cryptargs="${cryptargs} --perf-no_read_workqueue"
+ ;;
+ no-write-workqueue|perf-no_read_workqueue)
+ cryptargs="${cryptargs} --perf-no_write_workqueue"
+ ;;
*)
echo "Encryption option '${cryptopt}' not known, ignoring." >&2
;;
esac
done
+ set +f
+ IFS="$OLDIFS"
+ unset OLDIFS
if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then
if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then
diff --git a/srcpkgs/mkinitcpio/files/lvm2_hook b/srcpkgs/mkinitcpio/files/lvm2_hook
index 3c28d67ffb97..65de7bd2fdd7 100644
--- a/srcpkgs/mkinitcpio/files/lvm2_hook
+++ b/srcpkgs/mkinitcpio/files/lvm2_hook
@@ -5,19 +5,6 @@ run_earlyhook() {
lvmetad
}
-# We are suffering a race condition in non-systemd initramfs: If lvmetad is
-# killed before pvscan processes finish we have stale processes and
-# uninitialized physical volumes. So wait for pvscan processes to finish.
-# Break after 10 seconds (50*0.2s) to avaid infinite loop.
-run_latehook() {
- local i=50
-
- while pgrep -f pvscan >/dev/null 2>/dev/null && [ $i -gt 0 ]; do
- sleep 0.2
- i=$((i - 1))
- done
-}
-
run_cleanuphook() {
kill $(cat /run/lvmetad.pid)
}
diff --git a/srcpkgs/mkinitcpio/files/lvm2_install b/srcpkgs/mkinitcpio/files/lvm2_install
index d7a63332a403..0d109f9acc4c 100644
--- a/srcpkgs/mkinitcpio/files/lvm2_install
+++ b/srcpkgs/mkinitcpio/files/lvm2_install
@@ -30,6 +30,7 @@ build() {
add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
add_file "/usr/lib/initcpio/udev/69-dm-lvm-metad.rules" "/usr/lib/udev/rules.d/69-dm-lvm-metad.rules"
add_file "/etc/lvm/lvm.conf"
+ sed -i '/^\smonitoring =/s/1/0/' "${BUILDROOT}/etc/lvm/lvm.conf"
add_runscript
}
diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template
index ee5ff2025d5a..da7bd7e68c8b 100644
--- a/srcpkgs/mkinitcpio/template
+++ b/srcpkgs/mkinitcpio/template
@@ -1,7 +1,7 @@
# Template file for 'mkinitcpio'
pkgname=mkinitcpio
version=30
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="asciidoc"
depends="busybox-static bsdtar bash"
next reply other threads:[~2021-08-30 2:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-30 2:33 travankor [this message]
2022-02-28 12:59 ` travankor
2022-02-28 12:59 ` [PR PATCH] [Closed]: " travankor
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-32750@inbox.vuxu.org \
--to=travankor@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).