summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2010-09-28 14:58:32 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2010-09-28 14:58:32 +0000
commitc1c530d2aa4f3e176af0a0aa28f557b152debf27 (patch)
treefce3bf3770c8de7a5194f1e265f8c8fd59abbdd4 /profiles
parentMarking wvstreams-4.6.1-r1 ppc for bug 333613 (diff)
downloadhistorical-c1c530d2aa4f3e176af0a0aa28f557b152debf27.tar.gz
historical-c1c530d2aa4f3e176af0a0aa28f557b152debf27.tar.bz2
historical-c1c530d2aa4f3e176af0a0aa28f557b152debf27.zip
Added COLLECTD_PLUGINS to USE_EXPAND, defined a default list of plugins
Diffstat (limited to 'profiles')
-rw-r--r--profiles/base/ChangeLog6
-rw-r--r--profiles/base/make.defaults8
2 files changed, 11 insertions, 3 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index a563b62da302..342b36f9d92f 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.176 2010/09/27 20:04:54 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.177 2010/09/28 14:58:32 dilfridge Exp $
+
+ 28 Sep 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
+ make.defaults:
+ Added COLLECTD_PLUGINS to USE_EXPAND, defined a default list of plugins
27 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
package.use.mask:
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 44ce8edb092c..776ea4c4cd8b 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,13 +1,13 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.55 2010/09/26 13:04:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.56 2010/09/28 14:58:32 dilfridge Exp $
#
# System-wide defaults for the Portage system
# See portage(5) manpage
# Env vars to expand into USE vars. Modifying this requires prior
# discussion on gentoo-dev@gentoo.org.
-USE_EXPAND="APACHE2_MODULES APACHE2_MPMS FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS"
+USE_EXPAND="APACHE2_MODULES APACHE2_MPMS FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS"
# USE_EXPAND variables whose contents are not shown in package manager
# output. Changes need discussion on gentoo-dev.
@@ -26,6 +26,10 @@ KERNEL="linux"
USERLAND="GNU"
INPUT_DEVICES="keyboard mouse"
+# Andreas K. Huettel <dilfridge@gentoo.org> (28 Sep 2010)
+# Small default list of enabled plugins for collectd
+COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog"
+
# Tomáš Chvátal <scarabeus@gentoo.org> (26 Oct 2010)
# By default enable all protocols for average GPS user
GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ubx"