diff options
| author | Cecil Hugh Watson <knoppmyth@gmail.com> | 2009-06-16 07:16:07 (GMT) |
|---|---|---|
| committer | Cecil Hugh Watson <knoppmyth@gmail.com> | 2009-06-16 07:16:07 (GMT) |
| commit | c072b9f94004963781846c5fe8349a3ea8c7818f (patch) | |
| tree | 8499f8d6656b045564a130271e8a2594e0788201 /abs/core-testing | |
| parent | defeb831ab4f4f16c6efe7bf85ea017324881b53 (diff) | |
| parent | a694d2e850545e12ebbbfdedfd54978e0b085ae2 (diff) | |
| download | linhes_pkgbuild-c072b9f94004963781846c5fe8349a3ea8c7818f.zip linhes_pkgbuild-c072b9f94004963781846c5fe8349a3ea8c7818f.tar.gz linhes_pkgbuild-c072b9f94004963781846c5fe8349a3ea8c7818f.tar.bz2 | |
Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs/core-testing')
| -rwxr-xr-x | abs/core-testing/LinHES-config/PKGBUILD | 2 | ||||
| -rwxr-xr-x | abs/core-testing/LinHES-config/mv_advanced.py | 10 | ||||
| -rw-r--r-- | abs/core-testing/mythtv/stable/mythweb/PKGBUILD | 2 | ||||
| -rw-r--r-- | abs/core-testing/mythtv/stable/mythweb/mythweb.install | 11 |
4 files changed, 19 insertions, 6 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"], diff --git a/abs/core-testing/mythtv/stable/mythweb/PKGBUILD b/abs/core-testing/mythtv/stable/mythweb/PKGBUILD index e601ae9..3dded7f 100644 --- a/abs/core-testing/mythtv/stable/mythweb/PKGBUILD +++ b/abs/core-testing/mythtv/stable/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb pkgver=0.21 -pkgrel=15 +pkgrel=18 pkgdesc="Web interface for MythTV's backend" arch=('i686' 'x86_64') url="http://www.mythtv.org" diff --git a/abs/core-testing/mythtv/stable/mythweb/mythweb.install b/abs/core-testing/mythtv/stable/mythweb/mythweb.install index 470cbd1..a2aa1bd 100644 --- a/abs/core-testing/mythtv/stable/mythweb/mythweb.install +++ b/abs/core-testing/mythtv/stable/mythweb/mythweb.install @@ -1,10 +1,13 @@ post_install() { - echo "You must create a symlink from /home/httpd/html/mythweb/video_dir" - echo "to your MythTV recordings directory. Don't forget to change the" - echo "permissions so that the webserver can read those files and create" - echo "thumbnails." + if [ ! -e /data/srv/httpd/htdocs/mythweb/data/video ] + then + ln -s /myth/video /data/srv/httpd/htdocs/mythweb/data/video + fi } +post_upgrade(){ + post_install $1 +} op=$1 shift $op $* |