diff options
| author | Yann Dupont <Yann.Dupont@univ-nantes.fr> | 2023-10-17 10:57:36 +0200 |
|---|---|---|
| committer | Simon Tournier <zimon.toutoune@gmail.com> | 2023-10-31 09:56:13 +0100 |
| commit | c0895371c5759c7d9edb330774e90f192cc4cf2c (patch) | |
| tree | 93942ffc46d5ab4ecf94c75bc9103f99568f950d | |
| parent | 5cbb0b15cce1cb9977dec29594c4b34aee3ddd2b (diff) | |
gnu: lvm2: Remove systemd rule.
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.
Signed-off-by: Simon Tournier <zimon.toutoune@gmail.com>
Change-Id: I6b9d583f5914cc127c067829b5891827c04608cb
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/linux.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/lvm2-no-systemd.patch | 20 |
3 files changed, 22 insertions, 0 deletions
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 0000000000..440559b96d --- /dev/null +++ b/gnu/packages/patches/lvm2-no-systemd.patch @@ -0,0 +1,20 @@ +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" |