GNU bug report logs - #66586
[PATCH] gnu: lvm2: Remove systemd rule.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Lars-Dominik Braun <lars <at> 6xq.net>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#66586: closed ([PATCH] gnu: lvm2: Remove systemd rule.)
Date: Sat, 25 May 2024 18:04:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Sat, 25 May 2024 20:03:05 +0200
with message-id <ZlIn2fdqp-H_-uMh <at> noor.fritz.box>
and subject line Re: [PATCH] gnu: lvm2: Remove systemd rule.
has caused the debbugs.gnu.org bug report #66586,
regarding [PATCH] gnu: lvm2: Remove systemd rule.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
66586: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=66586
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Simon Tournier <zimon.toutoune <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Yann Dupont <Yann.Dupont <at> univ-nantes.fr>
Subject: [PATCH] gnu: lvm2: Remove systemd rule.
Date: Tue, 17 Oct 2023 10:57:36 +0200

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

Fixes <https://issues.guix.gnu.org/65177>.
Reported by Adrien 'neox' Bourmault <neox <at> 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

[Message part 3 (message/rfc822, inline)]

From: Lars-Dominik Braun <lars <at> 6xq.net>
To: Yann Dupont <yann.dupont <at> univ-nantes.fr>
Cc: 66586-done <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: lvm2: Remove systemd rule.
Date: Sat, 25 May 2024 20:03:05 +0200

Hi,

> I hope this time patch won't be garbled… (trying to attach patch)

LGTM. Pushed as commit 83fc6c7f72fcab3a68c82dd02f872429d632a2c0.

Lars

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.