unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#66586] [PATCH] gnu: lvm2: Remove systemd rule.
@ 2023-10-17  8:57 Simon Tournier
  2023-10-23 21:52 ` Ludovic Courtès
                   ` (6 more replies)
  0 siblings, 7 replies; 15+ messages in thread
From: Simon Tournier @ 2023-10-17  8:57 UTC (permalink / raw)
  To: 66586; +Cc: Yann Dupont, Leo Famulari, Tobias Geerinckx-Rice

From: Yann Dupont <Yann.Dupont@univ-nantes.fr>

Fixes <https://issues.guix.gnu.org/65177>.
Reported by Adrien 'neox' Bourmault <neox@gnu.org>.

* gnu/packages/patches/lvm2-no-systemd.patch: New file.
* gnu/packages/linux.scm (lvm2)[source]: Apply patch.
* gnu/local.mk: Register new patch.
---
 gnu/local.mk                               |  1 +
 gnu/packages/linux.scm                     |  1 +
 gnu/packages/patches/lvm2-no-systemd.patch | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 gnu/packages/patches/lvm2-no-systemd.patch

Hi,

Here is the patch from Yann sent in patch 65177 [1].  I have just reformatted
it and preprare it for merging if it is correct.  I know nothing about udev.

1: https://issues.guix.gnu.org/65177#3

Cheers,
simon


diff --git a/gnu/local.mk b/gnu/local.mk
index daacd786a7..3d74c3e228 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1625,6 +1625,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/mcrypt-CVE-2012-4527.patch			\
   %D%/packages/patches/libmemcached-build-with-gcc7.patch	\
   %D%/packages/patches/libmhash-hmac-fix-uaf.patch		\
+  %D%/packages/patches/lvm2-no-systemd.patch    		\
   %D%/packages/patches/maturin-no-cross-compile.patch		\
   %D%/packages/patches/mecab-variable-param.patch		\
   %D%/packages/patches/memtest86+-build-reproducibly.patch	\
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 6bb6d62182..6882244e92 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4527,6 +4527,7 @@ (define-public lvm2
               (sha256
                (base32
                 "0z6w6bknhwh1n3qfkb5ij6x57q3wjf28lq3l8kh7rkhsplinjnjc"))
+              (patches (search-patches "lvm2-no-systemd.patch"))
               (modules '((guix build utils)))
               (snippet
                '(begin
diff --git a/gnu/packages/patches/lvm2-no-systemd.patch b/gnu/packages/patches/lvm2-no-systemd.patch
new file mode 100644
index 0000000000..46b4dcffbb
--- /dev/null
+++ b/gnu/packages/patches/lvm2-no-systemd.patch
@@ -0,0 +1,22 @@
+Fixes <https://issues.guix.gnu.org/65177>.
+
+Since lvm2 2.03.14, the included udev rules use systemd-run to run vgchange
+and activate the volume group.  lvm2 was updated recently from 2.03.11 to
+2.03.21, then 2.03.22, and probably started exhibiting this behavior then.  It
+removes the indirection through systemd-run and directly run vgchange.
+
+diff --git a/udev/69-dm-lvm.rules.in b/udev/69-dm-lvm.rules.in
+index ff15681..f9e5b70 100644
+--- a/udev/69-dm-lvm.rules.in
++++ b/udev/69-dm-lvm.rules.in
+@@ -75,8 +75,8 @@ LABEL="lvm_scan"
+ # TODO: adjust the output of vgchange -aay so that
+ # it's better suited to appearing in the journal.
+ 
+-IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --autoactivation event --udevoutput --journal=output $env{DEVNAME}"
+-ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(SYSTEMDRUN) --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} (LVM_EXEC)/lvm vgchange -aay --autoactivation event $env{LVM_VG_NAME_COMPLETE}"
++IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg
++ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(SYSTEMDRUN) --no-block lvm-activate-$env{LVM_VG_NAME_COMPLETE} (LVM_EXEC)/lvm vgchange -aay
+ GOTO="lvm_end"
+ 
+ LABEL="lvm_end"

base-commit: b437896e87a51cc610388d4c462893652dd773e6
-- 
2.38.1





^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2024-05-27  7:29 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-17  8:57 [bug#66586] [PATCH] gnu: lvm2: Remove systemd rule Simon Tournier
2023-10-23 21:52 ` Ludovic Courtès
2023-10-24 16:48   ` Simon Tournier
2023-10-24 16:47 ` [bug#66586] [PATCH v2] " Simon Tournier
2023-10-29 23:22   ` Ludovic Courtès
2023-10-31  8:58     ` bug#66586: " Simon Tournier
2023-10-31 20:07       ` [bug#66586] " Josselin Poiret via Guix-patches via
2023-10-31 21:28         ` Simon Tournier
2023-10-31 22:11 ` [bug#66586] [PATCH v3] " Simon Tournier
2024-03-05 15:51 ` [bug#66586] [PATCH] " Yann Dupont
2024-04-02 17:26 ` Adrien 'neox' Bourmault
2024-04-10 13:19 ` [bug#66586] (no subject) Yann Dupont
2024-04-18 10:20 ` [bug#66586] [PATCH] gnu: lvm2: Remove systemd rule Yann Dupont
2024-05-25 18:03   ` bug#66586: " Lars-Dominik Braun
2024-05-27  7:26     ` [bug#66586] " Yann Dupont

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).