ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "gnu: lvm2: Remove systemd rule."

Browse source 
This reverts commit c0895371c5, which does not
correctly fix the issue, as reported by Josselin Poiret <dev@jpoiret.xyz> in
<https://issues.guix.gnu.org/issue/66586#6>.
This commit is contained in:
Simon Tournier 2023-10-31 21:28:43 +01:00
parent b963bf6b1d
commit 3991d9e4d9
No known key found for this signature in database
GPG key ID: 92F1D22C608EE7E5
3 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1629,7 +1629,6 @@ 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

@ -4494,7 +4494,6 @@ (define-public lvm2
(sha256
(base32
"0z6w6bknhwh1n3qfkb5ij6x57q3wjf28lq3l8kh7rkhsplinjnjc"))
(patches (search-patches "lvm2-no-systemd.patch"))
(modules '((guix build utils)))
(snippet
'(begin

20
gnu/packages/patches/lvm2-no-systemd.patch
View file

@ -1,20 +0,0 @@
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 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"