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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B9A6F139694 for ; Sat, 18 Feb 2017 21:30:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF230E0DA2; Sat, 18 Feb 2017 21:30:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A464AE0DA2 for ; Sat, 18 Feb 2017 21:30:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50576340FC1 for ; Sat, 18 Feb 2017 21:30:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A12974C83 for ; Sat, 18 Feb 2017 21:29:58 +0000 (UTC) From: "Marc Schiffbauer" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marc Schiffbauer" Message-ID: <1487453388.97c76ba0a6628a8c72d7a4aadebddac0c3b44559.mschiff@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/lvm.rc-2.02.166-r1 sys-fs/lvm2/files/lvm.rc-2.02.166-r2 sys-fs/lvm2/lvm2-2.02.166-r1.ebuild sys-fs/lvm2/lvm2-2.02.166-r2.ebuild X-VCS-Directories: sys-fs/lvm2/ sys-fs/lvm2/files/ X-VCS-Committer: mschiff X-VCS-Committer-Name: Marc Schiffbauer X-VCS-Revision: 97c76ba0a6628a8c72d7a4aadebddac0c3b44559 X-VCS-Branch: master Date: Sat, 18 Feb 2017 21:29:58 +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-Archives-Salt: 2ac07474-0979-4921-a466-df7c261479f0 X-Archives-Hash: c8b5249ffb0e371b9c4c5c6711a12ab2 commit: 97c76ba0a6628a8c72d7a4aadebddac0c3b44559 Author: Marc Schiffbauer gentoo org> AuthorDate: Sat Feb 18 21:28:37 2017 +0000 Commit: Marc Schiffbauer gentoo org> CommitDate: Sat Feb 18 21:29:48 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97c76ba0 sys-fs/lvm2: revbump 2.02.166 to fix #609416 Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../lvm2/files/{lvm.rc-2.02.166-r1 => lvm.rc-2.02.166-r2} | 15 +++++++++++++-- .../{lvm2-2.02.166-r1.ebuild => lvm2-2.02.166-r2.ebuild} | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.166-r1 b/sys-fs/lvm2/files/lvm.rc-2.02.166-r2 similarity index 91% rename from sys-fs/lvm2/files/lvm.rc-2.02.166-r1 rename to sys-fs/lvm2/files/lvm.rc-2.02.166-r2 index e779d2fb09..d14292c2c4 100644 --- a/sys-fs/lvm2/files/lvm.rc-2.02.166-r1 +++ b/sys-fs/lvm2/files/lvm.rc-2.02.166-r2 @@ -18,6 +18,12 @@ _need_lvmetad() ${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmetad=1' } +_need_lvmlockd() +{ + local lvm_path="$(_get_lvm_path)" + [ ! -x "${lvm_path}" ] && return 1 + ${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmlockd=1' +} depend() { before checkfs fsck after modules device-mapper @@ -33,6 +39,9 @@ depend() { if _need_lvmetad; then _need="${_need} lvmetad" fi + if _need_lvmlockd; then + _need="${_need} lvmlockd" + fi fi need sysfs ${_need} } @@ -77,8 +86,10 @@ start() { lvm_commands="${lvm_commands}vgscan --mknodes\n" # And turn them on! lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n" - # Start lockd VGs as required - lvm_commands="${lvm_commands}vgchange --lock-start --lock-opt auto\n" + if _need_lvmlockd; then + # Start lockd VGs as required + lvm_commands="${lvm_commands}vgchange --lock-start --lock-opt auto\n" + fi # Order of this is important, have to work around dash and LVM readline printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null eend $? "Failed to setup the LVM" diff --git a/sys-fs/lvm2/lvm2-2.02.166-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.166-r2.ebuild similarity index 99% rename from sys-fs/lvm2/lvm2-2.02.166-r1.ebuild rename to sys-fs/lvm2/lvm2-2.02.166-r2.ebuild index 8be6acbd8f..89fbbd63bb 100644 --- a/sys-fs/lvm2/lvm2-2.02.166-r1.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.166-r2.ebuild @@ -246,7 +246,7 @@ src_install() { if use !device-mapper-only ; then newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd - newinitd "${FILESDIR}"/lvm.rc-2.02.166-r1 lvm + newinitd "${FILESDIR}"/lvm.rc-2.02.166-r2 lvm newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring