diff options
| author |   Marc Schiffbauer <mschiff@gentoo.org> | 2017-02-18 22:28:37 +0100 |
|---|---|---|
| committer | Marc Schiffbauer <mschiff@gentoo.org> | 2017-02-18 22:29:48 +0100 |
| commit | 97c76ba0a6628a8c72d7a4aadebddac0c3b44559 (patch) | |
| tree | db034bed0865359963eceff01dd0b76325a849ad /sys-fs | |
| parent | games-engines/openmw: Drop old (diff) | |
| download | gentoo-97c76ba0a6628a8c72d7a4aadebddac0c3b44559.tar.gz gentoo-97c76ba0a6628a8c72d7a4aadebddac0c3b44559.tar.bz2 gentoo-97c76ba0a6628a8c72d7a4aadebddac0c3b44559.zip | |
sys-fs/lvm2: revbump 2.02.166 to fix #609416
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/lvm2/files/lvm.rc-2.02.166-r2 (renamed from sys-fs/lvm2/files/lvm.rc-2.02.166-r1) | 15 | ||||
| -rw-r--r-- | sys-fs/lvm2/lvm2-2.02.166-r2.ebuild (renamed from sys-fs/lvm2/lvm2-2.02.166-r1.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 index e779d2fb09e5..d14292c2c481 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 index 8be6acbd8f0b..89fbbd63bb0b 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 |