From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B7AF5158086 for ; Mon, 27 Dec 2021 00:05:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17DB62BC003; Mon, 27 Dec 2021 00:05:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4B5382BC003 for ; Mon, 27 Dec 2021 00:05:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 606C2342B46 for ; Mon, 27 Dec 2021 00:05:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8EBAA261 for ; Mon, 27 Dec 2021 00:05:15 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1640563513.c52ed8996b70a39521a5f6a82d2d64d7ddc08d99.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/, sys-fs/lvm2/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/lvm2/files/lvm2-2.03.14-dm_lvm_rules_no_systemd.patch sys-fs/lvm2/lvm2-2.03.14-r1.ebuild sys-fs/lvm2/lvm2-2.03.14.ebuild X-VCS-Directories: sys-fs/lvm2/ sys-fs/lvm2/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c52ed8996b70a39521a5f6a82d2d64d7ddc08d99 X-VCS-Branch: master Date: Mon, 27 Dec 2021 00:05:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c38fb10c-d1c2-4100-9026-d048cd46da63 X-Archives-Hash: 9cb5df1531e7280823b9f55cb4c384a3 commit: c52ed8996b70a39521a5f6a82d2d64d7ddc08d99 Author: Lars Wendler gentoo org> AuthorDate: Mon Dec 27 00:01:54 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Dec 27 00:05:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52ed899 sys-fs/lvm2: Don't use systemd-run on openrc systems Signed-off-by: Lars Wendler gentoo.org> .../lvm2-2.03.14-dm_lvm_rules_no_systemd.patch | 37 ++++++++++++++++++++++ ...{lvm2-2.03.14.ebuild => lvm2-2.03.14-r1.ebuild} | 5 +++ 2 files changed, 42 insertions(+) diff --git a/sys-fs/lvm2/files/lvm2-2.03.14-dm_lvm_rules_no_systemd.patch b/sys-fs/lvm2/files/lvm2-2.03.14-dm_lvm_rules_no_systemd.patch new file mode 100644 index 000000000000..0b4a156c630f --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.14-dm_lvm_rules_no_systemd.patch @@ -0,0 +1,37 @@ +From 88d5b3d711c8546864e57dbfba7591a19be80c4d Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Mon, 27 Dec 2021 00:53:21 +0100 +Subject: [PATCH] Don't use systemd-run in 69-dm-lvm.rules + +some people don't run systemd +--- + udev/69-dm-lvm.rules.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/udev/69-dm-lvm.rules.in b/udev/69-dm-lvm.rules.in +index 39e5b9807..6ba4efa0f 100644 +--- a/udev/69-dm-lvm.rules.in ++++ b/udev/69-dm-lvm.rules.in +@@ -62,8 +62,8 @@ ENV{SYSTEMD_READY}="1" + # LVM_VG_NAME_COMPLETE='foo' + # + # When the VG is complete it can be activated, so +-# vgchange -aay is run. It is run via +-# systemd since it can take longer to run than ++# vgchange -aay is run. It can take ++# longer to run than + # udev wants to block when processing rules. + # (if there are hundreds of LVs to activate, + # the vgchange can take many seconds.) +@@ -80,7 +80,7 @@ ENV{SYSTEMD_READY}="1" + # it's better suited to appearing in the journal. + + IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --udevoutput --journal=output $env{DEVNAME}" +-ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="/usr/bin/systemd-run -r --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} lvm vgchange -aay --nohints $env{LVM_VG_NAME_COMPLETE}" ++ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(LVM_EXEC)/lvm vgchange -aay --nohints $env{LVM_VG_NAME_COMPLETE}" + GOTO="lvm_end" + + LABEL="lvm_end" +-- +2.34.1 + diff --git a/sys-fs/lvm2/lvm2-2.03.14.ebuild b/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild similarity index 98% rename from sys-fs/lvm2/lvm2-2.03.14.ebuild rename to sys-fs/lvm2/lvm2-2.03.14-r1.ebuild index f27b82cc4ef0..a0f3b38b6ae8 100644 --- a/sys-fs/lvm2/lvm2-2.03.14.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild @@ -99,6 +99,11 @@ pkg_setup() { src_prepare() { default + # Users without systemd get no auto-activation of any logical volume + if ! use systemd ; then + eapply "${FILESDIR}"/${PN}-2.03.14-dm_lvm_rules_no_systemd.patch + fi + sed -i \ -e "1iAR = $(tc-getAR)" \ -e "s:CC ?= @CC@:CC = $(tc-getCC):" \