From 4e45176422a6ccd0c7447feb53b622283ad64689 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Mon, 15 Jun 2009 15:46:32 -0500 Subject: LinHES-config: hook up rrd_tool to the advanced menu new mythvantage with rrdtool changed to rrd_stats --- abs/core-testing/LinHES-config/PKGBUILD | 2 +- abs/core-testing/LinHES-config/mv_advanced.py | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index c000c02..4488cbc 100755 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.0 -pkgrel=13 +pkgrel=14 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates rsync python-parted ddcxinfo) diff --git a/abs/core-testing/LinHES-config/mv_advanced.py b/abs/core-testing/LinHES-config/mv_advanced.py index 01351df..d7c65f1 100755 --- a/abs/core-testing/LinHES-config/mv_advanced.py +++ b/abs/core-testing/LinHES-config/mv_advanced.py @@ -66,6 +66,14 @@ def setup_splash(Usebootsplash): cmd = ''' sed -i "s/^default.*1/default 0/g" /boot/grub/menu.lst''' mv_common.runcmd(cmd) return +def setup_rrd(UseRRD): + if UseRRD == "1": + logging.info(" Enabling rrd_stats") + mv_common.pacinstall("rrd_stats") + else: + logging.info(" Disabling rrd_stats") + mv_common.pacremove("rrd_stats") + def setup_hobbit(UseHobbit,SystemType,dbhost): if UseHobbit == "1": @@ -355,6 +363,8 @@ def setup_advanced(systemconfig,data_config): setup_hobbit(systemconfig["UseHobbit"], systemconfig["SystemType"], systemconfig["dbhost"]) + if data_config.SYSTEMTYPE == "LinHES": + setup_rrd(systemconfig["UseRRD"]) setup_evrouter(systemconfig["UseEvrouter"], systemconfig["EvrouterConfig"], -- cgit v0.12