From patchwork Tue Oct 17 08:57:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54925 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 C304927BBEA; Tue, 17 Oct 2023 09:59:01 +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=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 A8CA927BBE2 for ; Tue, 17 Oct 2023 09:58:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qsfuU-0004JF-2Q; Tue, 17 Oct 2023 04:58:42 -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 1qsfuQ-0004I8-M1 for guix-patches@gnu.org; Tue, 17 Oct 2023 04:58:38 -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 1qsfuQ-0002r0-EE for guix-patches@gnu.org; Tue, 17 Oct 2023 04:58:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qsfuo-0006J0-1K; Tue, 17 Oct 2023 04:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66586] [PATCH] gnu: lvm2: Remove systemd rule. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: leo@famulari.name, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 17 Oct 2023 08:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66586 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66586@debbugs.gnu.org Cc: Yann Dupont , Leo Famulari , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.169753310224189 (code B ref -1); Tue, 17 Oct 2023 08:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Oct 2023 08:58:22 +0000 Received: from localhost ([127.0.0.1]:58560 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qsfu9-0006I4-L5 for submit@debbugs.gnu.org; Tue, 17 Oct 2023 04:58:22 -0400 Received: from lists.gnu.org ([2001:470:142::17]:36986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qsfu5-0006Hm-UX for submit@debbugs.gnu.org; Tue, 17 Oct 2023 04:58:20 -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 1qsftb-0003N1-77 for guix-patches@gnu.org; Tue, 17 Oct 2023 04:57:47 -0400 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qsftZ-0002fn-0n for guix-patches@gnu.org; Tue, 17 Oct 2023 04:57:46 -0400 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-5047bc00f1eso1744110e87.1 for ; Tue, 17 Oct 2023 01:57:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697533063; x=1698137863; darn=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=bqDNHgpyV/Sf/RvWRaKAVQ4QpfXlAEmR5bATHW425CQ=; b=APlRr1VnOYjCR/6I+U0loPwytToFMfhtmwGYToIrJoBRVH9Qce5muJWdxsleetQ5av yDcdPpTTJ73iGXEOOayzgkyBrPZ/Nu+ZiK6gWsTtJohgjphYTS8E1HkoXCjOWVqwoBS2 hYGctNu7Gp0jx1Xg9J9abSz6cxrtVTvu9pzghNowMzG3Pdz0vGGHhxHzW8phD+lzZptM nv764eayOEsgdM/VU9FHxFioh3F0bVeZ9q3iLSts4DZ23PCVIUH133t5WsODOZU9YOPq zOBeMYWaGABjznmkZroURKX0T15pm0mXlY/6dfLR3ri2HGVGyLNa5iRKH9a7+cto0zTm sM+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697533063; x=1698137863; 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=bqDNHgpyV/Sf/RvWRaKAVQ4QpfXlAEmR5bATHW425CQ=; b=c/KNif8q0GpU1ZlI18YJW9GKRBGjYCcZW9Lbgdm77JXBtgNoMtYFajhXOVZmczncbU o0ZHUXdRQZKomPlqTZzoKgd6M/liK1GZtD6vCjE+mhDATEmpGn7wpZoVpvnVK1AjhKfC qFVjmCC64Hjejb/7bm9WqSp43Vc0f8k7ZZlPt7GmBfFfdIEe7i18reQzMXgOaJSPo+lB BsNGwdnYXxmEnwNKZKio1bof389LLIqv4oDJG/F+bwz+A4rI9i/bq5GHVVghjWUqmhb3 eN/Fd933sVFW7TbVtQRATWa7kwAV9WxJN3zeY681Wd177STMcxIAsXBJHN+0YZZve2FL 87Zg== X-Gm-Message-State: AOJu0YxVqrl41loXnphxJL1VKIFHutzH6P53ZIbzE1LYzC8wUMPpWpuE u86wnXbgLmzqcv3xKCVEyKe81Qsp6x8= X-Google-Smtp-Source: AGHT+IFujzP7ogrpZw4i+sA108jLQuEAjRvch7JWstaXLYvZE1FIBLzyLv6tLHKKPb129HwSYwilJg== X-Received: by 2002:a05:6512:3e04:b0:507:b911:f86a with SMTP id i4-20020a0565123e0400b00507b911f86amr1253262lfv.2.1697533062492; Tue, 17 Oct 2023 01:57:42 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id n35-20020a05600c502300b004064ac107cfsm1307290wmr.39.2023.10.17.01.57.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 01:57:41 -0700 (PDT) From: Simon Tournier Date: Tue, 17 Oct 2023 10:57:36 +0200 Message-ID: <716e42d582706ad11107e1b48bdd252966bd4133.1697532777.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::136; envelope-from=zimon.toutoune@gmail.com; helo=mail-lf1-x136.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 | 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 base-commit: b437896e87a51cc610388d4c462893652dd773e6 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 . + +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"