me
/
guix
Archived
1
0
Fork 0
Code

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 <lars@6xq.net>
Change-Id: Ib4342e0ce3cc5778857ccecd557f3d397aa870d9
master
Yann Dupont 2024-04-18 12:20:58 +02:00 committed by Lars-Dominik Braun
parent cca25a6769
commit 83fc6c7f72
No known key found for this signature in database
GPG Key ID: F663943E08D8092A
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@ -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 \

1
gnu/packages/linux.scm
View File

@ -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

18
gnu/packages/patches/lvm2-no-systemd.patch 100644
View File

@ -0,0 +1,18 @@
Fixes <https://issues.guix.gnu.org/65177>.
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"