[bug#66586] [PATCH] gnu: lvm2: Remove systemd rule.

[bug#66586] [PATCH] gnu: lvm2: Remove systemd rule.

[Simon Tournier]

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

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

[bug#66586] [PATCH] gnu: lvm2: Remove systemd rule.

[Ludovic Courtès]

Hi!

Simon Tournier <zimon.toutoune@gmail.com> skribis:

> From: Yann Dupont <Yann.Dupont@univ-nantes.fr>
>
> 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.

One minor nit:

> +++ 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.

I propose to change this paragraph so that it is self-contained, like:

  Run ‘vgchange’ directly instead of attempting to run it via
  ‘systemd-run’ as the udev rules included in lvm2 >= 2.03.14 do.

LGTM with a change along these lines!

Ludo’.

[bug#66586] [PATCH v2] gnu: lvm2: Remove systemd rule.

[Simon Tournier]

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

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.
---
 gnu/local.mk                               |  1 +
 gnu/packages/linux.scm                     |  1 +
 gnu/packages/patches/lvm2-no-systemd.patch | 20 ++++++++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 gnu/packages/patches/lvm2-no-systemd.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 43145caf80..4c8800b274 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1627,6 +1627,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 f02577d2d5..c618651553 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4494,6 +4494,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..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"

base-commit: f3714b3d5f51aced4b31447c42d5e89c75e3079f
-- 
2.38.1

[bug#66586] [PATCH] gnu: lvm2: Remove systemd rule.

[Simon Tournier]

Hi Ludo,

On Mon, 23 Oct 2023 at 23:52, Ludovic Courtès <ludo@gnu.org> wrote:

> I propose to change this paragraph so that it is self-contained, like:
>
>   Run ‘vgchange’ directly instead of attempting to run it via
>   ‘systemd-run’ as the udev rules included in lvm2 >= 2.03.14 do.

I copy/pasted these lines in v2.

Cheers,
simon

[bug#66586] [PATCH v2] gnu: lvm2: Remove systemd rule.

[Ludovic Courtès]

Simon Tournier <zimon.toutoune@gmail.com> skribis:

> From: Yann Dupont <Yann.Dupont@univ-nantes.fr>
>
> 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.

LGTM, thanks!

bug#66586: [PATCH v2] gnu: lvm2: Remove systemd rule.

[Simon Tournier]

Hi,

On lun., 30 oct. 2023 at 00:22, Ludovic Courtès <ludo@gnu.org> wrote:
> Simon Tournier <zimon.toutoune@gmail.com> skribis:
>
>> From: Yann Dupont <Yann.Dupont@univ-nantes.fr>
>>
>> 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.
>
> LGTM, thanks!

Pushed as c0895371c5759c7d9edb330774e90f192cc4cf2c.

Cheers,
simon

[bug#66586] [PATCH v2] gnu: lvm2: Remove systemd rule.

[Josselin Poiret via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 447 bytes --]

Hi everyone,

The given .patch file is malformed: there are no closing double quotes
for each of the strings.  Additionally, I don't believe that the
reference to systemd has been truly removed with this, as it's
referenced in the second line of the patch.

I get errors immediately in my dmesg when booting with this patch.  Has
this been tested?  I believe this will affect users relying on LVM
volumes.

Best,
-- 
Josselin Poiret

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 682 bytes --]

[bug#66586] [PATCH v2] gnu: lvm2: Remove systemd rule.

[Simon Tournier]

Hi,

On Tue, 31 Oct 2023 at 21:07, Josselin Poiret via Guix-patches via <guix-patches@gnu.org> wrote:

> I get errors immediately in my dmesg when booting with this patch.

Reverted 3991d9e4d9867ec499283bfc71b34d7bfebe49b3.  Oops, sorry for the
annoyance.  I screwed up!

Could you propose a fix for <https://issues.guix.gnu.org/65177>?

Cheers,
simon

[bug#66586] [PATCH v3] gnu: lvm2: Remove systemd rule.

[Simon Tournier]

Follow-up of 3991d9e4d9867ec499283bfc71b34d7bfebe49b3.

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

Change-Id: I916fb5f6ae786d22af69f0a7d81c0c28da3c96ea
---
 gnu/local.mk                               |  1 +
 gnu/packages/linux.scm                     |  1 +
 gnu/packages/patches/lvm2-no-systemd.patch | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 gnu/packages/patches/lvm2-no-systemd.patch

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 @@ (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..f786cd9705
--- /dev/null
+++ b/gnu/packages/patches/lvm2-no-systemd.patch
@@ -0,0 +1,19 @@
+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..d3cc125 100644
+--- a/udev/69-dm-lvm.rules.in
++++ b/udev/69-dm-lvm.rules.in
+@@ -75,8 +75,7 @@ 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}"
++ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(LVM_EXEC)/lvm vgchange -aay --autoactivation event $env{LVM_VG_NAME_COMPLETE}"
+ GOTO="lvm_end"
+ 
+ LABEL="lvm_end"

base-commit: 3991d9e4d9867ec499283bfc71b34d7bfebe49b3
-- 
2.41.0

[bug#66586] [PATCH] gnu: lvm2: Remove systemd rule.

[Yann Dupont]

Hi, this bug is still open, and, as far as I can tell, generating a VM 
using lvm2 is still currently broken.

Is there still a problem preventing this path from being integrated?

[bug#66586] [PATCH] gnu: lvm2: Remove systemd rule.

[Adrien 'neox' Bourmault]

Hi there, I just tested it but it did not work while not showing the error I
reported earlier. I just obtain "Device ... not found or access denied".

However, it might be linked to 70051 too, so I'll try to test with that too (or
wait it's merged).

[bug#66586] (no subject)

[Yann Dupont]

[-- Attachment #1: Type: text/plain, Size: 716 bytes --]

Hi there,

I'd looked at the patch Simon reformatted and it seemed fine, but I just 
tested *this* thread's patch, and it doesn't seem to work.

I suspect there's an extra "-" in the 1st line of the 3rd patch (it 
wasn't in my original patch https://issues.guix.gnu.org/65177#3) 
<https://issues.guix.gnu.org/65177#3>.

the « - » in the line '-IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache 
--listvg --checkcomplete --vgonline --autoactivation event --udevoutput 
--journal=output $env{DEVNAME}' is too much in the patch.

I've just tested the generation of a VM generated with the patch 
amputated from the excess line and it's ok.

Unless someone does it before me, I'll try again to post the correct 
version.

[-- Attachment #2: Type: text/html, Size: 1039 bytes --]

[bug#66586] [PATCH] gnu: lvm2: Remove systemd rule.

[Yann Dupont]

[-- Attachment #1: Type: text/plain, Size: 69 bytes --]

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


[-- Attachment #2: patch-for-65177 --]
[-- Type: text/plain, Size: 2232 bytes --]

diff --git a/gnu/local.mk b/gnu/local.mk
index 2e0c6a5d3c..d9d11b31b9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1694,6 +1694,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 9c819838bd..549de85ea4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4613,6 +4613,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..f43e568bb1
--- /dev/null
+++ b/gnu/packages/patches/lvm2-no-systemd.patch
@@ -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"

bug#66586: [PATCH] gnu: lvm2: Remove systemd rule.

[Lars-Dominik Braun]

Hi,

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

LGTM. Pushed as commit 83fc6c7f72fcab3a68c82dd02f872429d632a2c0.

Lars

[bug#66586] [PATCH] gnu: lvm2: Remove systemd rule.

[Yann Dupont]

[-- Attachment #1: Type: text/plain, Size: 385 bytes --]


Le 25/05/2024 à 20:03, Lars-Dominik Braun a écrit :
> Hi,
>
>> I hope this time patch won't be garbled… (trying to attach patch)
> LGTM. Pushed as commit 83fc6c7f72fcab3a68c82dd02f872429d632a2c0.
>
> Lars
>
Hi Lars-Dominik, thanks !

Regards,

-- 
Yann Dupont -  GLiCID Centre Calcul Intensif Pays de la Loire
Tel : 02.53.48.49.39 - Mail/Mattermost : Yann.Dupont@univ-nantes.fr


[-- Attachment #2: Signature cryptographique S/MIME --]
[-- Type: application/pkcs7-signature, Size: 2339 bytes --]