From patchwork Tue Oct 31 22:11:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 55763 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 CD50A27BBEA; Tue, 31 Oct 2023 22:13:00 +0000 (GMT) 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=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 9BA2A27BBE2 for ; Tue, 31 Oct 2023 22:12:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxwyO-0003go-3T; Tue, 31 Oct 2023 18:12:32 -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 1qxwyM-0003ge-D3 for guix-patches@gnu.org; Tue, 31 Oct 2023 18:12:30 -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 1qxwyM-0006cR-4X for guix-patches@gnu.org; Tue, 31 Oct 2023 18:12:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxwys-0003ZD-Al; Tue, 31 Oct 2023 18:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66586] [PATCH v3] 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: leo@famulari.name, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 31 Oct 2023 22:13:02 +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 Cc: Yann.Dupont@univ-nantes.fr, dev@jpoiret.xyz, Simon Tournier , Leo Famulari , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice Received: via spool by 66586-submit@debbugs.gnu.org id=B66586.169879035713677 (code B ref 66586); Tue, 31 Oct 2023 22:13:02 +0000 Received: (at 66586) by debbugs.gnu.org; 31 Oct 2023 22:12:37 +0000 Received: from localhost ([127.0.0.1]:49435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxwyS-0003YX-Rz for submit@debbugs.gnu.org; Tue, 31 Oct 2023 18:12:37 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:38106) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxwyO-0003YH-1c for 66586@debbugs.gnu.org; Tue, 31 Oct 2023 18:12:35 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-32da42b8225so1419388f8f.0 for <66586@debbugs.gnu.org>; Tue, 31 Oct 2023 15:11:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698790312; x=1699395112; 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=5pt74rXxn8QhjdT10/PcUmBCunv0+wT3iSWMBEbeHkI=; b=DzIvmm9ZmpsNlscz4hhPF1/884e6vUwWnVtq2Vh1eKkbKhNHsKLITdRHNQgfOG7YKw +T6QofjrTPpquFdniwtqabgjtfb3F9TePvTaY4xQnrtOEb9NLlcv5t4oOlx9TNbGreF9 JJXATiwt5okS04054AYBQmRbXHNeiKpSy9Aa1ArWdy6sch31bYkt2RGU1Zw/TCM2hjTQ UPP8wJVaVKtDBN08/dn0dUV199Pb0kx5jDsn3YcgwojlSEqKLQMj8dagnk7Hp1SKfuxy slRqvfcEbRIxLRF2HEHvphzOzCePIorQ6Zs38jyST8++cDk+/8dr6l2VLrhBie7i6E5N AKHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698790312; x=1699395112; 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=5pt74rXxn8QhjdT10/PcUmBCunv0+wT3iSWMBEbeHkI=; b=c/CnVkg/BQoHLuPU1jpvY1pC0hB0WSSlV3rPAfcjpuUZALW8afuQb0ky+kCyLp4lvn JyO9MfyHVW8gA5sL8DdXUeU2vmlBDzzN0WAKNwPLYz0Ih9/nLNfVpL9XEqz1zRTwwRmt XsmsYnc5MvtF4+qkS3Z4VRV5MgslbXvH+fObxNX7YpgFP+Yl2HvtZyfkVsnCBfvjwmwc pQgq9SFDJP8dVUPx5xyCshgbXjhxFDR9Lw4Z4wfXDQHYBpSLGfDmrZlW4AdQ4HJhZgNL OYR9Al2kL4L4V8/AfjrUJLeqGjLfo8EtsMaaqXolrsMdHsWc+1QPeL/8lAJHBScdSnJq q72A== X-Gm-Message-State: AOJu0YzZ/eQ8AIGTICWuG+sxiD42id7Vq39mZpZ3PaunPhMgu3JhBLuK VDqo/7H2Jx4ZkzX4XoBNpp5v9Og6xFc= X-Google-Smtp-Source: AGHT+IHS0LT06wJhw6MCICBTz5pPa41pWoZByub682vwGykt7a2SODkXVp7cxOKCENS2U9eQpA9vnA== X-Received: by 2002:a05:600c:1c21:b0:401:7d3b:cc84 with SMTP id j33-20020a05600c1c2100b004017d3bcc84mr11380396wms.0.1698790311448; Tue, 31 Oct 2023 15:11:51 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id h19-20020a05600c30d300b003fefaf299b6sm2741632wmn.38.2023.10.31.15.11.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 15:11:51 -0700 (PDT) From: Simon Tournier Date: Tue, 31 Oct 2023 23:11:42 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 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 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 base-commit: 3991d9e4d9867ec499283bfc71b34d7bfebe49b3 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 . + +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"