summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2011-03-26 08:43:16 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2011-03-26 08:43:16 +0000
commit8fd25abb760c73ac31733aef6561a1fad743bba5 (patch)
tree41e514890d6011ebfa6ce24d59bdcb67f930adb8 /sys-cluster
parentVersion bump (diff)
downloadgentoo-2-8fd25abb760c73ac31733aef6561a1fad743bba5.tar.gz
gentoo-2-8fd25abb760c73ac31733aef6561a1fad743bba5.tar.bz2
gentoo-2-8fd25abb760c73ac31733aef6561a1fad743bba5.zip
Disable global survey by default in example conf file wrt #360483 by robbat2
(Portage version: 2.2.0_alpha27/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/drbd/ChangeLog5
-rw-r--r--sys-cluster/drbd/drbd-8.3.9.ebuild8
2 files changed, 9 insertions, 4 deletions
diff --git a/sys-cluster/drbd/ChangeLog b/sys-cluster/drbd/ChangeLog
index bd1ee4485af7..f485135a6c51 100644
--- a/sys-cluster/drbd/ChangeLog
+++ b/sys-cluster/drbd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-cluster/drbd
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.106 2011/02/19 09:32:37 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/ChangeLog,v 1.107 2011/03/26 08:43:16 xarthisius Exp $
+
+ 26 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> drbd-8.3.9.ebuild:
+ Disable global survey by default in example conf file wrt #360483 by robbat2
*drbd-8.3.9 (19 Feb 2011)
diff --git a/sys-cluster/drbd/drbd-8.3.9.ebuild b/sys-cluster/drbd/drbd-8.3.9.ebuild
index 8c9bdc599829..6803f7d2cd9e 100644
--- a/sys-cluster/drbd/drbd-8.3.9.ebuild
+++ b/sys-cluster/drbd/drbd-8.3.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.9.ebuild,v 1.1 2011/02/19 09:32:37 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/drbd/drbd-8.3.9.ebuild,v 1.2 2011/03/26 08:43:16 xarthisius Exp $
EAPI="2"
@@ -25,6 +25,8 @@ src_prepare() {
# correct install paths
sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
scripts/Makefile.in || die
+ # don't participate in user survey bug 360483
+ sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
epatch "${FILESDIR}"/${PN}-8.3.8.1-implicits.patch
}
@@ -60,8 +62,8 @@ src_install() {
pkg_postinst() {
einfo
- einfo "Please copy and gunzip the configuration file"
- einfo "from /usr/share/doc/${PF}/drbd.conf.bz2 to /etc"
+ einfo "Please copy and gunzip the configuration file:"
+ einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
einfo "and edit it to your needs. Helpful commands:"
einfo "man 5 drbd.conf"
einfo "man 8 drbdsetup"