From patchwork Tue Oct 24 16:47:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 55332 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DCBE727BBE2; Tue, 24 Oct 2023 17:49:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 28F8027BBE9 for ; Tue, 24 Oct 2023 17:49:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvKaC-0000b1-2O; Tue, 24 Oct 2023 12:48:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvKa2-0000Yt-VL for guix-patches@gnu.org; Tue, 24 Oct 2023 12:48:35 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvKa0-0008Uh-Ia; Tue, 24 Oct 2023 12:48:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvKaT-00064I-Vi; Tue, 24 Oct 2023 12:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66586] [PATCH v2] gnu: lvm2: Remove systemd rule. References: <716e42d582706ad11107e1b48bdd252966bd4133.1697532777.git.zimon.toutoune@gmail.com> In-Reply-To: <716e42d582706ad11107e1b48bdd252966bd4133.1697532777.git.zimon.toutoune@gmail.com> Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 16:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66586 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66586@debbugs.gnu.org Cc: Yann Dupont , ludo@gnu.org X-Debbugs-Original-Xcc: ludo@gnu.org Received: via spool by 66586-submit@debbugs.gnu.org id=B66586.169816608622985 (code B ref 66586); Tue, 24 Oct 2023 16:49:01 +0000 Received: (at 66586) by debbugs.gnu.org; 24 Oct 2023 16:48:06 +0000 Received: from localhost ([127.0.0.1]:56531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvKZZ-0005yf-5x for submit@debbugs.gnu.org; Tue, 24 Oct 2023 12:48:05 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:38001) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvKZS-0005y5-UL for 66586@debbugs.gnu.org; Tue, 24 Oct 2023 12:48:04 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-407acb21f27so5238825e9.0 for <66586@debbugs.gnu.org>; Tue, 24 Oct 2023 09:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698166042; x=1698770842; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5XvyP+qUGyDMRHeF2iJ4Y0uE5rAHtSldlnqow4sQ73w=; b=a7zMbteeu9jz1CrbtPjW1SRZXZiISw24f9GzXV1JbiQq2cZ2zVmfUQv+xctqXY3dpL BJFc3TpstBUFa/S+WP4z+ec3GXaqH5Pjke8NtZwMuLUOX+sL1c+0ZRS7DLx3NPid0jbC Pd8KY76QmFbD/2HNKuhIJxLdCciJ/Mv2ZGtLj4B47l/Lyg3zNLZ47lx4RqGFmQxANYu5 5LmtxCdXfNtWE6BXCsLw4HdLlKMG7At38hfJ9Qr+Da2+1X4gDragD1OB8G/MbmrKkSg7 jyqAOlUjkShQj3WhkwvXVCuah8GpGiXBFD28SjWj7/AeqQP8sIXvlYtFN10wQ4UcK+vg XjAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698166042; x=1698770842; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5XvyP+qUGyDMRHeF2iJ4Y0uE5rAHtSldlnqow4sQ73w=; b=C2+kns5o8PjK4R3ZHUh/wCiSvkZIiGIjs1uWyACozvXbuGyp7qMyQi8PIaavKLNt/R Dlt7dCyS5UoGnqjZ0H+9llxn407fHt1GWAXzN9A6NavYiJdp3Dg6GXM7fUW2fkbCH+4k kIj+jFsxLV1N9Yd0cb/8wL5I/nau7wcBBXiG9ldHvhq56Sr0Tp3lS0x55MfAJoWJ1M8n FHKBhxdFF3vPezHy5inPQ000yY1F/VcUGc7DaNBJjiNf00hFEHKtkKxT9PIbhhp4fVU9 Tw4asb/2BCoAmjtU2/3wozYW/HZ/iUjVs9FY7kU8zzj+2VcLYvCiAgM56YV840DtGX/y arsQ== X-Gm-Message-State: AOJu0YzFGtZmjVWerxj+dIJJ9tRr7M3Ca6/sa/1dRNIqC+66whRR1dyX FRPC9j/deludpfIY4Q5qb8Sv6Bc6Pf4= X-Google-Smtp-Source: AGHT+IF9N2InQ8zL24fPQeAPDa8u1gc19wxOw8bn+x9G1xv5tPPH1k+YF6UyfnXHbwtr+MWN/yO3BQ== X-Received: by 2002:a05:600c:35cc:b0:401:7d3b:cc84 with SMTP id r12-20020a05600c35cc00b004017d3bcc84mr9705428wmq.0.1698166042356; Tue, 24 Oct 2023 09:47:22 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id l23-20020a1c7917000000b004063cced50bsm12256895wme.23.2023.10.24.09.47.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 09:47:21 -0700 (PDT) From: Simon Tournier Date: Tue, 24 Oct 2023 18:47:14 +0200 Message-Id: <9102296a5c1faade8528ec115eee7ebb17ce9a5f.1698165907.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Yann Dupont 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. --- 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 base-commit: f3714b3d5f51aced4b31447c42d5e89c75e3079f 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 . + +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"