summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/LinHES-config
diff options
context:
space:
mode:
authorBob Igo <bob@stormlogic.com>2009-06-16 18:15:36 (GMT)
committerBob Igo <bob@stormlogic.com>2009-06-16 18:15:36 (GMT)
commit7ea54e94edf113f577fecc27793fe03a8a5080da (patch)
treea6b20719d265258d18680f49ae255437f2f924f9 /abs/core-testing/LinHES-config
parentf2af490d9405bd022455cbd81408fcd23b7cfe12 (diff)
parentc072b9f94004963781846c5fe8349a3ea8c7818f (diff)
downloadlinhes_pkgbuild-7ea54e94edf113f577fecc27793fe03a8a5080da.zip
linhes_pkgbuild-7ea54e94edf113f577fecc27793fe03a8a5080da.tar.gz
linhes_pkgbuild-7ea54e94edf113f577fecc27793fe03a8a5080da.tar.bz2
Merge branch 'master' of ssh://igo@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs/core-testing/LinHES-config')
-rwxr-xr-xabs/core-testing/LinHES-config/PKGBUILD2
-rwxr-xr-xabs/core-testing/LinHES-config/mv_advanced.py10
2 files changed, 11 insertions, 1 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index c000c02..40413ed 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=15
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"],