Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 565154 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/sys-fs/lvm2/lvm2-2.02.136.ebuild (-11 / +24 lines)
Lines 13-22 Link Here
13
LICENSE="GPL-2"
13
LICENSE="GPL-2"
14
SLOT="0"
14
SLOT="0"
15
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
15
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
16
IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
16
IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd lvmetad selinux +udev +thin device-mapper-only"
17
REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
17
REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !lvmetad !thin )
18
	systemd? ( udev )
18
	systemd? ( udev )
19
	clvm? ( !systemd )"
19
	clvm? ( !systemd )
20
	lvmetad? ( udev )"
20
21
21
DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
22
DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
22
	readline? ( sys-libs/readline:0= )
23
	readline? ( sys-libs/readline:0= )
Lines 81-91 Link Here
81
82
82
	sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
83
	sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
83
84
84
	if use udev && ! use device-mapper-only; then
85
	cp "${FILESDIR}"/lvm.rc-2.02.105-r2 "${T}"/lvm.rc
86
	if use lvmetad; then
87
		# Note that conf/example.conf.in says:
88
		#
89
		# If lvmetad has been running while use_lvmetad was 0, it MUST be stopped
90
		# before changing use_lvmetad to 1 and started again afterwards.
91
		#
92
		# So, is this safe on a system with "use_lvmetad = 0"...?
85
		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
93
		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
86
		elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
94
		elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"lvmetad\" in"
87
		elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
95
		elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
88
		elog "if it was previously disabled."
96
		elog "if it was previously disabled."
97
	else
98
		sed -i 's/ lvmetad//' "${T}"/lvm.rc
89
	fi
99
	fi
90
100
91
	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
101
	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
Lines 115-121 Link Here
115
	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
125
	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
116
	myconf="${myconf} $(use_enable !device-mapper-only applib)"
126
	myconf="${myconf} $(use_enable !device-mapper-only applib)"
117
	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
127
	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
118
	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
128
	myconf="${myconf} $(use_enable lvmetad)"
119
	use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs"
129
	use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs"
120
130
121
	# Most of this package does weird stuff.
131
	# Most of this package does weird stuff.
Lines 227-239 Link Here
227
237
228
	if use !device-mapper-only ; then
238
	if use !device-mapper-only ; then
229
		newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
239
		newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
230
		newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm
240
		newinitd "${T}"/lvm.rc lvm
231
		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
241
		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
232
242
233
		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
243
		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
234
		newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad
235
	fi
244
	fi
236
245
246
	use lvmetad && newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad
247
237
	if use clvm; then
248
	if use clvm; then
238
		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
249
		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
239
		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
250
		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
Lines 264-272 Link Here
264
pkg_postinst() {
275
pkg_postinst() {
265
	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
276
	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
266
	ewarn "# rc-update add lvm boot"
277
	ewarn "# rc-update add lvm boot"
267
	ewarn
278
	if use lvmetad; then
268
	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
279
		ewarn
269
	ewarn "to enable lvm autoactivation and metadata caching."
280
		ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
281
		ewarn "to enable lvm autoactivation and metadata caching."
282
	fi
270
}
283
}
271
284
272
src_test() {
285
src_test() {

Return to bug 565154