branch master updated: gnu: lvm2: Remove systemd rule.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

lbraun pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new 83fc6c7f72 gnu: lvm2: Remove systemd rule.
83fc6c7f72 is described below

commit 83fc6c7f72fcab3a68c82dd02f872429d632a2c0
Author: Yann Dupont 
AuthorDate: Thu Apr 18 12:20:58 2024 +0200

gnu: lvm2: Remove systemd rule.

* gnu/packages/patches/lvm2-no-systemd.patch: New file.
* gnu/packages/linux.scm (lvm2)[source]: Apply patch.
* gnu/local.mk: Register new patch.

Signed-off-by: Lars-Dominik Braun 
Change-Id: Ib4342e0ce3cc5778857ccecd557f3d397aa870d9
---
 gnu/local.mk   |  1 +
 gnu/packages/linux.scm |  1 +
 gnu/packages/patches/lvm2-no-systemd.patch | 18 ++
 3 files changed, 20 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 11394472c7..502e97ecd5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1705,6 +1705,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 a9b78a7986..67e924642e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4579,6 +4579,7 @@ one to send arbitrary keycodes when a given key is tapped 
or held.")
   (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 00..f43e568bb1
--- /dev/null
+++ b/gnu/packages/patches/lvm2-no-systemd.patch
@@ -0,0 +1,18 @@
+Fixes .
+
+Run 'vgchange' directly instead of attempting to run it via 'systemd-run' as
+the udev rules included in lvm2 >= 2.03.14 do.
+
+diff --git a/udev/69-dm-lvm.rules.in b/udev/69-dm-lvm.rules.in
+index ff1568145..8879a2ef9 100644
+--- a/udev/69-dm-lvm.rules.in
 b/udev/69-dm-lvm.rules.in
+@@ -76,7 +76,7 @@ LABEL="lvm_scan"
+ # 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}"
++ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(LVM_EXEC)/lvm vgchange -aay 
--autoactivation event $env{LVM_VG_NAME_COMPLETE}"
+ GOTO="lvm_end"
+
+ LABEL="lvm_end"

branch master updated: gnu: lvm2: Remove systemd rule.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

zimoun pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
 new c0895371c5 gnu: lvm2: Remove systemd rule.
c0895371c5 is described below

commit c0895371c5759c7d9edb330774e90f192cc4cf2c
Author: Yann Dupont 
AuthorDate: Tue Oct 17 10:57:36 2023 +0200

gnu: lvm2: Remove systemd rule.

Fixes .
Reported by Adrien 'neox' Bourmault .

* gnu/packages/patches/lvm2-no-systemd.patch: New file.
* gnu/packages/linux.scm (lvm2)[source]: Apply patch.
* gnu/local.mk: Register new patch.

Signed-off-by: Simon Tournier 
Change-Id: I6b9d583f5914cc127c067829b5891827c04608cb
---
 gnu/local.mk   |  1 +
 gnu/packages/linux.scm |  1 +
 gnu/packages/patches/lvm2-no-systemd.patch | 20 
 3 files changed, 22 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 8d817379a7..27e57302ae 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1629,6 +1629,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 7a9f357681..6abdb23958 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4494,6 +4494,7 @@ one to send arbitrary keycodes when a given key is tapped 
or held.")
   (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 00..440559b96d
--- /dev/null
+++ b/gnu/packages/patches/lvm2-no-systemd.patch
@@ -0,0 +1,20 @@
+Fixes .
+
+Run 'vgchange' directly instead of attempting to run it via 'systemd-run' as
+the udev rules included in lvm2 >= 2.03.14 do.
+
+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"