From patchwork Thu Apr 18 10:20:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yann Dupont X-Patchwork-Id: 63123 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 3B86A27BBEB; Thu, 18 Apr 2024 11:22: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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 893E927BBEA for ; Thu, 18 Apr 2024 11:22:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxOu2-00043T-5f; Thu, 18 Apr 2024 06:22:02 -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 1rxOu0-00043G-Er for guix-patches@gnu.org; Thu, 18 Apr 2024 06:22:00 -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 1rxOtz-00073p-V2 for guix-patches@gnu.org; Thu, 18 Apr 2024 06:22:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rxOuC-0007zE-SN for guix-patches@gnu.org; Thu, 18 Apr 2024 06:22:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66586] [PATCH] 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: Yann Dupont Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Apr 2024 10:22:12 +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: To: 66586@debbugs.gnu.org Received: via spool by 66586-submit@debbugs.gnu.org id=B66586.171343572030614 (code B ref 66586); Thu, 18 Apr 2024 10:22:12 +0000 Received: (at 66586) by debbugs.gnu.org; 18 Apr 2024 10:22:00 +0000 Received: from localhost ([127.0.0.1]:51548 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxOtq-0007wY-UE for submit@debbugs.gnu.org; Thu, 18 Apr 2024 06:21:58 -0400 Received: from smtptls1-lmb.cpub.univ-nantes.fr ([193.52.103.110]:49262 helo=smtp-tls.univ-nantes.fr) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rxOtF-0007qq-RP for 66586@debbugs.gnu.org; Thu, 18 Apr 2024 06:21:20 -0400 Received: from localhost (localhost [127.0.0.1]) by smtp-tls.univ-nantes.fr (Postfix) with ESMTP id B19DC202F7 for <66586@debbugs.gnu.org>; Thu, 18 Apr 2024 12:20:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=univ-nantes.fr; s=mailv2; t=1713435658; bh=M9u+OMxf+5MrNLWFba7WYohOa2BI8kd+OmHwc+YpFN0=; h=Date:To:Subject:From:From; b=Z5mDn/dvRSjfrTPWjdGDbl1EUYO4KrEAQFjqtNRhg4dUYr3lGP5bXRlfO53daGTmH Q7GhpsM0am6EXrrKmszic9s15SSC66GTEWF90DImC8cUH7bh55pJVF/PVLrw+Ui9rN LPFv21LZhHFcK+MB59wr6lAJoWR1o0qbZml2qYH1jVldn08tvu3+iA6lkYd6y7EUTt mU3ywRhAOPuKP6afGzJW4t9rDXFxdpsgkk3urNDhmxYvNzA7UrldZCUy0h5TdTHa+R gCiKif/7gnAhZ7jZo0T82OtZzKP7VD6/8pKH8ChPfY344yPf1MIokJqVgaZcCb0RCE 2g5FpAjFagZjg== X-Virus-Scanned: Debian amavisd-new at smtptls1-lmb.cpub.univ-nantes.fr Received: from smtp-tls.univ-nantes.fr ([127.0.0.1]) by localhost (smtptls1-lmb.cpub.univ-nantes.fr [127.0.0.1]) (amavisd-new, port 10024) with LMTP id hDEBXp5jX3rg for <66586@debbugs.gnu.org>; Thu, 18 Apr 2024 12:20:58 +0200 (CEST) Received: from [IPV6:2001:660:7220:389:de9f:6270:1f4:1d60] (unknown [IPv6:2001:660:7220:389:de9f:6270:1f4:1d60]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by smtp-tls.univ-nantes.fr (Postfix) with ESMTPSA id 8F2EE202F3 for <66586@debbugs.gnu.org>; Thu, 18 Apr 2024 12:20:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=univ-nantes.fr; s=mailv2; t=1713435658; bh=M9u+OMxf+5MrNLWFba7WYohOa2BI8kd+OmHwc+YpFN0=; h=Date:To:Subject:From:From; b=Z5mDn/dvRSjfrTPWjdGDbl1EUYO4KrEAQFjqtNRhg4dUYr3lGP5bXRlfO53daGTmH Q7GhpsM0am6EXrrKmszic9s15SSC66GTEWF90DImC8cUH7bh55pJVF/PVLrw+Ui9rN LPFv21LZhHFcK+MB59wr6lAJoWR1o0qbZml2qYH1jVldn08tvu3+iA6lkYd6y7EUTt mU3ywRhAOPuKP6afGzJW4t9rDXFxdpsgkk3urNDhmxYvNzA7UrldZCUy0h5TdTHa+R gCiKif/7gnAhZ7jZo0T82OtZzKP7VD6/8pKH8ChPfY344yPf1MIokJqVgaZcCb0RCE 2g5FpAjFagZjg== Message-ID: <06ddf9e4-2cc9-e424-362f-8bedf6166b7d@univ-nantes.fr> Date: Thu, 18 Apr 2024 12:20:58 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Content-Language: en-US From: Yann Dupont Organization: Nantes =?utf-8?q?Universit=C3=A9/GLiCID?= 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 I hope this time patch won't be garbled… (trying to attach patch) 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 . + +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"